Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Web Hosting EKS - PHP 8.4
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OTDI Web Hosting
Container Images
Web Hosting EKS - PHP 8.4
Commits
06400683
Commit
06400683
authored
11 months ago
by
Edward Hicks
Browse files
Options
Downloads
Patches
Plain Diff
update composer & add 7zip
parent
dc8aa1cb
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile
+4
-2
4 additions, 2 deletions
Dockerfile
usr/local/src/composer-setup.php
+15
-12
15 additions, 12 deletions
usr/local/src/composer-setup.php
with
19 additions
and
14 deletions
Dockerfile
+
4
−
2
View file @
06400683
...
...
@@ -104,14 +104,16 @@ RUN ln -sv /usr/local/bin/composer2.phar /usr/local/bin/composer2
RUN
php composer-setup.php
--1
RUN
mv
-v
composer.phar /usr/local/bin/composer1.phar
RUN
ln
-sv
/usr/local/bin/composer1.phar /usr/local/bin/composer1
RUN
ln
-sv
/usr/local/bin/composer22.phar /usr/local/bin/composer
RUN
php composer-setup.php
RUN
mv
-v
composer.phar /usr/local/bin/composer.phar
RUN
ln
-sv
/usr/local/bin/composer.phar /usr/local/bin/composer
#RUN php /usr/local/bin/composer completion bash > /etc/profile.d/composer.sh
# Clean up the build environment
RUN
yum
-y
group remove
"Development Tools"
\
--setopt
=
groupremove_leaf_only
=
1
\
--setopt
=
clean_requirements_on_remove
=
1
RUN
yum
-y
install
git patch unzip
RUN
yum
-y
install
git patch unzip
p7zip
RUN
yum
-y
clean all
RUN
rm
-rf
/var/cache/yum/ /tmp/
*
/usr/local/src/
*
...
...
This diff is collapsed.
Click to expand it.
usr/local/src/composer-setup.php
+
15
−
12
View file @
06400683
...
...
@@ -1194,7 +1194,7 @@ class Installer
}
}
if
(
file_exists
(
$this
->
tmpFile
))
{
if
(
$this
->
tmpFile
!==
null
&&
file_exists
(
$this
->
tmpFile
))
{
@
unlink
(
$this
->
tmpFile
);
}
}
...
...
@@ -1337,6 +1337,9 @@ class NoProxyPattern
class
HttpClient
{
/** @var null|string */
private
static
$caPath
;
private
$options
=
array
(
'http'
=>
array
());
private
$disableTls
=
false
;
...
...
@@ -1615,34 +1618,32 @@ class HttpClient {
*/
public
static
function
getSystemCaRootBundlePath
()
{
static
$caPath
=
null
;
if
(
$caPath
!==
null
)
{
return
$caPath
;
if
(
self
::
$caPath
!==
null
)
{
return
self
::
$caPath
;
}
// If SSL_CERT_FILE env variable points to a valid certificate/bundle, use that.
// This mimics how OpenSSL uses the SSL_CERT_FILE env variable.
$envCertFile
=
getenv
(
'SSL_CERT_FILE'
);
if
(
$envCertFile
&&
is_readable
(
$envCertFile
)
&&
validateCaFile
(
file_get_contents
(
$envCertFile
)))
{
return
$caPath
=
$envCertFile
;
return
self
::
$caPath
=
$envCertFile
;
}
// If SSL_CERT_DIR env variable points to a valid certificate/bundle, use that.
// This mimics how OpenSSL uses the SSL_CERT_FILE env variable.
$envCertDir
=
getenv
(
'SSL_CERT_DIR'
);
if
(
$envCertDir
&&
is_dir
(
$envCertDir
)
&&
is_readable
(
$envCertDir
))
{
return
$caPath
=
$envCertDir
;
return
self
::
$caPath
=
$envCertDir
;
}
$configured
=
ini_get
(
'openssl.cafile'
);
if
(
$configured
&&
strlen
(
$configured
)
>
0
&&
is_readable
(
$configured
)
&&
validateCaFile
(
file_get_contents
(
$configured
)))
{
return
$caPath
=
$configured
;
return
self
::
$caPath
=
$configured
;
}
$configured
=
ini_get
(
'openssl.capath'
);
if
(
$configured
&&
is_dir
(
$configured
)
&&
is_readable
(
$configured
))
{
return
$caPath
=
$configured
;
return
self
::
$caPath
=
$configured
;
}
$caBundlePaths
=
array
(
...
...
@@ -1658,22 +1659,24 @@ class HttpClient {
'/usr/local/etc/ssl/cert.pem'
,
// FreeBSD 10.x
'/usr/local/etc/openssl/cert.pem'
,
// OS X homebrew, openssl package
'/usr/local/etc/openssl@1.1/cert.pem'
,
// OS X homebrew, openssl@1.1 package
'/opt/homebrew/etc/openssl@3/cert.pem'
,
// macOS silicon homebrew, openssl@3 package
'/opt/homebrew/etc/openssl@1.1/cert.pem'
,
// macOS silicon homebrew, openssl@1.1 package
);
foreach
(
$caBundlePaths
as
$caBundle
)
{
if
(
@
is_readable
(
$caBundle
)
&&
validateCaFile
(
file_get_contents
(
$caBundle
)))
{
return
$caPath
=
$caBundle
;
return
self
::
$caPath
=
$caBundle
;
}
}
foreach
(
$caBundlePaths
as
$caBundle
)
{
$caBundle
=
dirname
(
$caBundle
);
if
(
is_dir
(
$caBundle
)
&&
glob
(
$caBundle
.
'/*'
))
{
return
$caPath
=
$caBundle
;
return
self
::
$caPath
=
$caBundle
;
}
}
return
$caPath
=
false
;
return
self
::
$caPath
=
false
;
}
public
static
function
getPackagedCaFile
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment