Revert "ssl_client will become obsolete when busybox gets migrated to openssl 3, for now we need to still add it explicitly for current alpine edge, while this is being worked on"

This has since occurred and we no longer need this workaround for alpine edge.

This reverts commit 85a24618b0.
This commit is contained in:
El RIDO 2022-02-13 09:51:26 +01:00
parent f459d85349
commit 6e7cf3c019
No known key found for this signature in database
GPG key ID: 0F5C940A6BD81F92

View file

@ -27,7 +27,7 @@ RUN \
# Install dependencies
&& apk upgrade --no-cache \
&& apk add --no-cache gnupg git nginx php8-fpm php8-json php8-gd php8-opcache \
s6 ssl_client tzdata ${ALPINE_PACKAGES} ${ALPINE_COMPOSER_PACKAGES} \
s6 tzdata ${ALPINE_PACKAGES} ${ALPINE_COMPOSER_PACKAGES} \
# Remove (some of the) default nginx config
&& rm -f /etc/nginx.conf /etc/nginx/http.d/default.conf /etc/php8/php-fpm.d/www.conf \
&& rm -rf /etc/nginx/sites-* \
@ -78,7 +78,7 @@ RUN \
# Clean up
&& gpgconf --kill gpg-agent \
&& rm -rf /tmp/* \
&& apk del --no-cache gnupg git ssl_client ${ALPINE_COMPOSER_PACKAGES}
&& apk del --no-cache gnupg git ${ALPINE_COMPOSER_PACKAGES}
COPY etc/ /etc/