Compare commits

..

2 Commits

Author SHA1 Message Date
ff31032247 Revert "Temporary drone docker in docker workaround"
All checks were successful
continuous-integration/drone/push Build is passing
This reverts commit 26f8618bedc025df90e4ac30f09b8982fac7299e.
2021-08-21 16:59:50 +02:00
1e12a71b2f Revert "Upgrade to alpine 3.14"
This reverts commit 4bfe35d078745f3f784b465bd61933669b884590.
2021-08-21 16:59:44 +02:00
2 changed files with 6 additions and 11 deletions

View File

@ -19,9 +19,7 @@ name: build:latest
steps:
- name: docker release
# image: plugins/docker
# Temporary work-around for https://github.com/drone-plugins/drone-docker/pull/327
image: techknowlogick/drone-docker
image: plugins/docker
depends_on: [clone]
user: 0
settings:
@ -45,9 +43,7 @@ name: build:tags
steps:
- name: build $DRONE_TAG
# image: plugins/docker
# Temporary work-around for https://github.com/drone-plugins/drone-docker/pull/327
image: techknowlogick/drone-docker
image: plugins/docker
user: 0
depends_on: [clone]
settings:
@ -71,9 +67,7 @@ name: build:nightly
steps:
- name: docker release
# image: plugins/docker
# Temporary work-around for https://github.com/drone-plugins/drone-docker/pull/327
image: techknowlogick/drone-docker
image: plugins/docker
user: 0
depends_on: [clone]
settings:

View File

@ -47,7 +47,7 @@ ARG CONFIG="\
--add-module=/usr/src/ngx_brotli \
"
FROM registry.odit.services/hub/library/alpine:3.14
FROM registry.odit.services/hub/library/alpine:3.13
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
ARG NGINX_VERSION
@ -132,7 +132,7 @@ RUN \
| xargs -r apk info --installed \
| sort -u > /tmp/runDeps.txt
FROM registry.odit.services/hub/library/alpine:3.14
FROM registry.odit.services/hub/library/alpine:3.13
ARG NGINX_VERSION
COPY --from=0 /tmp/runDeps.txt /tmp/runDeps.txt
@ -145,6 +145,7 @@ COPY --from=0 /usr/bin/envsubst /usr/local/bin/envsubst
RUN \
addgroup -S nginx \
&& adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx \
&& apk add --no-cache --upgrade apk-tools \
&& apk add --no-cache --virtual .nginx-rundeps tzdata $(cat /tmp/runDeps.txt) \
&& rm /tmp/runDeps.txt \
&& ln -s /usr/lib/nginx/modules /etc/nginx/modules \