switch to packaged composer
This commit is contained in:
parent
8c5df7cfdb
commit
77369792b5
1 changed files with 3 additions and 7 deletions
10
Dockerfile
10
Dockerfile
|
@ -35,8 +35,8 @@ RUN \
|
|||
fi \
|
||||
# Install dependencies
|
||||
&& apk upgrade --no-cache \
|
||||
&& apk add --no-cache gnupg git nginx php83 php83-fpm php83-gd php83-opcache \
|
||||
s6 tzdata ${ALPINE_PACKAGES} ${ALPINE_COMPOSER_PACKAGES} \
|
||||
&& apk add --no-cache composer gnupg git nginx php83 php83-fpm php83-gd \
|
||||
php83-opcache s6 tzdata ${ALPINE_PACKAGES} ${ALPINE_COMPOSER_PACKAGES} \
|
||||
# Stabilize php config location
|
||||
&& mv /etc/php83 /etc/php \
|
||||
&& ln -s /etc/php /etc/php83 \
|
||||
|
@ -62,10 +62,6 @@ RUN \
|
|||
git clone ${PBURL%%/}.git -b ${RELEASE}; \
|
||||
(cd $(basename ${PBURL}) && git archive --prefix ${RELEASE}/ --format tgz ${RELEASE} > /tmp/${RELEASE}.tar.gz); \
|
||||
fi \
|
||||
&& if [ -n "${COMPOSER_PACKAGES}" ] ; then \
|
||||
wget -qO composer-installer.php https://getcomposer.org/installer \
|
||||
&& php composer-installer.php --install-dir=/usr/local/bin --filename=composer ;\
|
||||
fi \
|
||||
&& cd /var/www \
|
||||
&& tar -xzf /tmp/${RELEASE}.tar.gz --strip 1 \
|
||||
&& if [ -n "${COMPOSER_PACKAGES}" ] ; then \
|
||||
|
@ -90,7 +86,7 @@ RUN \
|
|||
# Clean up
|
||||
&& gpgconf --kill gpg-agent \
|
||||
&& rm -rf /tmp/* \
|
||||
&& apk del --no-cache gnupg git ${ALPINE_COMPOSER_PACKAGES}
|
||||
&& apk del --no-cache composer gnupg git ${ALPINE_COMPOSER_PACKAGES}
|
||||
|
||||
COPY etc/ /etc/
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue