switch to packaged composer

This commit is contained in:
El RIDO 2024-02-12 21:24:17 +01:00
parent 8c5df7cfdb
commit 77369792b5
No known key found for this signature in database
GPG key ID: 0F5C940A6BD81F92

View file

@ -35,8 +35,8 @@ RUN \
fi \ fi \
# Install dependencies # Install dependencies
&& apk upgrade --no-cache \ && apk upgrade --no-cache \
&& apk add --no-cache gnupg git nginx php83 php83-fpm php83-gd php83-opcache \ && apk add --no-cache composer gnupg git nginx php83 php83-fpm php83-gd \
s6 tzdata ${ALPINE_PACKAGES} ${ALPINE_COMPOSER_PACKAGES} \ php83-opcache s6 tzdata ${ALPINE_PACKAGES} ${ALPINE_COMPOSER_PACKAGES} \
# Stabilize php config location # Stabilize php config location
&& mv /etc/php83 /etc/php \ && mv /etc/php83 /etc/php \
&& ln -s /etc/php /etc/php83 \ && ln -s /etc/php /etc/php83 \
@ -62,10 +62,6 @@ RUN \
git clone ${PBURL%%/}.git -b ${RELEASE}; \ git clone ${PBURL%%/}.git -b ${RELEASE}; \
(cd $(basename ${PBURL}) && git archive --prefix ${RELEASE}/ --format tgz ${RELEASE} > /tmp/${RELEASE}.tar.gz); \ (cd $(basename ${PBURL}) && git archive --prefix ${RELEASE}/ --format tgz ${RELEASE} > /tmp/${RELEASE}.tar.gz); \
fi \ 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 \ && cd /var/www \
&& tar -xzf /tmp/${RELEASE}.tar.gz --strip 1 \ && tar -xzf /tmp/${RELEASE}.tar.gz --strip 1 \
&& if [ -n "${COMPOSER_PACKAGES}" ] ; then \ && if [ -n "${COMPOSER_PACKAGES}" ] ; then \
@ -90,7 +86,7 @@ RUN \
# Clean up # Clean up
&& gpgconf --kill gpg-agent \ && gpgconf --kill gpg-agent \
&& rm -rf /tmp/* \ && 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/ COPY etc/ /etc/