Merge pull request #70 from PrivateBin/edge-ssl-fix

edge build: deal with ssl_client while busybox gets migrated to openssl 3
This commit is contained in:
El RIDO 2021-09-28 06:11:41 +02:00 committed by GitHub
commit 20b7e06207
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

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 tzdata ${ALPINE_PACKAGES} ${ALPINE_COMPOSER_PACKAGES} \
s6 ssl_client 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-* \
@ -77,7 +77,7 @@ RUN \
&& chmod o+rwx /run /var/lib/nginx /var/lib/nginx/tmp \
# Clean up
&& rm -rf /tmp/* \
&& apk del --no-cache gnupg git ${ALPINE_COMPOSER_PACKAGES}
&& apk del --no-cache gnupg git ssl_client ${ALPINE_COMPOSER_PACKAGES}
COPY etc/ /etc/