nune/privatebin-docker-nginx-fpm-alpine
nune/privatebin-docker-nginx-fpm-alpine
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #87 from PrivateBin/cleanup

Browse source 
Cleanup edge build / improve smoke test
This commit is contained in:
El RIDO 2022-02-15 18:55:03 +01:00 • committed by GitHub
commit 35c74f66bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -27,7 +27,7 @@ RUN \
# Install dependencies # Install dependencies
&& apk upgrade --no-cache \ && apk upgrade --no-cache \
&& apk add --no-cache gnupg git nginx php8-fpm php8-json php8-gd php8-opcache \ && 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 # 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 -f /etc/nginx.conf /etc/nginx/http.d/default.conf /etc/php8/php-fpm.d/www.conf \
&& rm -rf /etc/nginx/sites-* \ && rm -rf /etc/nginx/sites-* \
@ -78,7 +78,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 ssl_client ${ALPINE_COMPOSER_PACKAGES} && apk del --no-cache gnupg git ${ALPINE_COMPOSER_PACKAGES}
COPY etc/ /etc/ COPY etc/ /etc/

2
buildx.sh
View file

@ -82,7 +82,7 @@ main() {
sleep 5 # give the services time to start up and the log to collect any errors that might occur sleep 5 # give the services time to start up and the log to collect any errors that might occur
test "$(docker inspect --format="{{.State.Running}}" smoketest)" = true test "$(docker inspect --format="{{.State.Running}}" smoketest)" = true
curl --silent --show-error -o /dev/null http://127.0.0.1:8080/ curl --silent --show-error -o /dev/null http://127.0.0.1:8080/
if docker logs smoketest 2>&1 | grep -E "warn|emerg|fatal|panic" if docker logs smoketest 2>&1 | grep -i -E "warn|emerg|fatal|panic|error"
then then
exit 1 exit 1
fi fi