Compare commits
No commits in common. "ff31032247f87c8ff72186dbec9a7f8116e8c25e" and "4bfe35d078745f3f784b465bd61933669b884590" have entirely different histories.
ff31032247
...
4bfe35d078
12
.drone.yml
12
.drone.yml
@ -19,7 +19,9 @@ name: build:latest
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: docker release
|
- name: docker release
|
||||||
image: plugins/docker
|
# image: plugins/docker
|
||||||
|
# Temporary work-around for https://github.com/drone-plugins/drone-docker/pull/327
|
||||||
|
image: techknowlogick/drone-docker
|
||||||
depends_on: [clone]
|
depends_on: [clone]
|
||||||
user: 0
|
user: 0
|
||||||
settings:
|
settings:
|
||||||
@ -43,7 +45,9 @@ name: build:tags
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: build $DRONE_TAG
|
- name: build $DRONE_TAG
|
||||||
image: plugins/docker
|
# image: plugins/docker
|
||||||
|
# Temporary work-around for https://github.com/drone-plugins/drone-docker/pull/327
|
||||||
|
image: techknowlogick/drone-docker
|
||||||
user: 0
|
user: 0
|
||||||
depends_on: [clone]
|
depends_on: [clone]
|
||||||
settings:
|
settings:
|
||||||
@ -67,7 +71,9 @@ name: build:nightly
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: docker release
|
- name: docker release
|
||||||
image: plugins/docker
|
# image: plugins/docker
|
||||||
|
# Temporary work-around for https://github.com/drone-plugins/drone-docker/pull/327
|
||||||
|
image: techknowlogick/drone-docker
|
||||||
user: 0
|
user: 0
|
||||||
depends_on: [clone]
|
depends_on: [clone]
|
||||||
settings:
|
settings:
|
||||||
|
@ -47,7 +47,7 @@ ARG CONFIG="\
|
|||||||
--add-module=/usr/src/ngx_brotli \
|
--add-module=/usr/src/ngx_brotli \
|
||||||
"
|
"
|
||||||
|
|
||||||
FROM registry.odit.services/hub/library/alpine:3.13
|
FROM registry.odit.services/hub/library/alpine:3.14
|
||||||
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
|
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
|
||||||
|
|
||||||
ARG NGINX_VERSION
|
ARG NGINX_VERSION
|
||||||
@ -132,7 +132,7 @@ RUN \
|
|||||||
| xargs -r apk info --installed \
|
| xargs -r apk info --installed \
|
||||||
| sort -u > /tmp/runDeps.txt
|
| sort -u > /tmp/runDeps.txt
|
||||||
|
|
||||||
FROM registry.odit.services/hub/library/alpine:3.13
|
FROM registry.odit.services/hub/library/alpine:3.14
|
||||||
ARG NGINX_VERSION
|
ARG NGINX_VERSION
|
||||||
|
|
||||||
COPY --from=0 /tmp/runDeps.txt /tmp/runDeps.txt
|
COPY --from=0 /tmp/runDeps.txt /tmp/runDeps.txt
|
||||||
@ -145,7 +145,6 @@ COPY --from=0 /usr/bin/envsubst /usr/local/bin/envsubst
|
|||||||
RUN \
|
RUN \
|
||||||
addgroup -S nginx \
|
addgroup -S nginx \
|
||||||
&& adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx 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) \
|
&& apk add --no-cache --virtual .nginx-rundeps tzdata $(cat /tmp/runDeps.txt) \
|
||||||
&& rm /tmp/runDeps.txt \
|
&& rm /tmp/runDeps.txt \
|
||||||
&& ln -s /usr/lib/nginx/modules /etc/nginx/modules \
|
&& ln -s /usr/lib/nginx/modules /etc/nginx/modules \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user