From 1e1ea14b18e6e5a42bfc65b03a8eb141d1031cd9 Mon Sep 17 00:00:00 2001 From: ODIT Renovate Bot Date: Mon, 23 May 2022 19:17:40 +0000 Subject: [PATCH 1/3] Update registry.odit.services/hub/library/alpine Docker tag to v3.16 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 823074d..fde27d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +47,7 @@ ARG CONFIG="\ --add-module=/usr/src/ngx_brotli \ " -FROM registry.odit.services/hub/library/alpine:3.15 +FROM registry.odit.services/hub/library/alpine:3.16 LABEL maintainer="NGINX Docker Maintainers " 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.15 +FROM registry.odit.services/hub/library/alpine:3.16 ARG NGINX_VERSION COPY --from=0 /tmp/runDeps.txt /tmp/runDeps.txt -- 2.47.2 From 8678157b653d6e9f5a5b072086ed74383eb3ca6e Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Mon, 18 Jul 2022 18:25:28 +0200 Subject: [PATCH 2/3] Alpine 3.15 --- Dockerfile | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index fde27d3..a37c24b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -ARG NGINX_VERSION=1.20.1 +ARG ALPINE_VERSION=3.15 +ARG NGINX_VERSION=1.20.2 ARG NGX_BROTLI_COMMIT=9aec15e2aa6feea2113119ba06460af70ab3ea62 ARG CONFIG="\ --prefix=/etc/nginx \ @@ -47,7 +48,7 @@ ARG CONFIG="\ --add-module=/usr/src/ngx_brotli \ " -FROM registry.odit.services/hub/library/alpine:3.16 +FROM registry.odit.services/hub/library/alpine:3.15 LABEL maintainer="NGINX Docker Maintainers " ARG NGINX_VERSION @@ -64,7 +65,7 @@ RUN \ zlib-dev \ linux-headers \ curl \ - gnupg1 \ + # gnupg \ libxslt-dev \ gd-dev \ geoip-dev \ @@ -91,8 +92,8 @@ RUN \ && curl -fSL https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz.asc -o nginx.tar.gz.asc \ && sha512sum nginx.tar.gz nginx.tar.gz.asc \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --import /tmp/nginx.pub \ - && gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \ + # && gpg --import /tmp/nginx.pub \ + # && gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \ && mkdir -p /usr/src \ && tar -zxC /usr/src -f nginx.tar.gz @@ -132,7 +133,7 @@ RUN \ | xargs -r apk info --installed \ | sort -u > /tmp/runDeps.txt -FROM registry.odit.services/hub/library/alpine:3.16 +FROM registry.odit.services/hub/library/alpine:3.15 ARG NGINX_VERSION COPY --from=0 /tmp/runDeps.txt /tmp/runDeps.txt @@ -145,7 +146,6 @@ 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 \ @@ -160,6 +160,7 @@ COPY nginx.vh.default.conf /etc/nginx/conf.d/default.conf EXPOSE 80 443 -STOPSIGNAL SIGTERM +STOPSIGNAL SIGQUIT -CMD ["nginx", "-g", "daemon off;"] +ENTRYPOINT ["nginx"] +CMD ["-g", "daemon off;"] \ No newline at end of file -- 2.47.2 From 9ef64cd501850659f233df9c92b2ee7dc9903ca4 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Mon, 18 Jul 2022 18:28:53 +0200 Subject: [PATCH 3/3] Updated ci confi --- .drone.yml | 69 +++++++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 37 deletions(-) diff --git a/.drone.yml b/.drone.yml index 13d62c3..46f856b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -68,19 +68,17 @@ steps: ssh_key: from_secret: git_ssh - name: docker release - image: plugins/docker - depends_on: [clone] - user: 0 + image: registry.odit.services/library/drone-kaniko + depends_on: [bump_patch] settings: username: from_secret: docker_username password: from_secret: docker_password - repo: registry.odit.services/library/nginx-brotli + repo: library/nginx-brotli tags: - latest - registry: registry.odit.services - mtu: 1000 + cache: true trigger: branch: - main @@ -89,20 +87,19 @@ kind: pipeline type: kubernetes name: build:tags steps: - - name: build_tag - image: plugins/docker - user: 0 + - name: docker release + image: registry.odit.services/library/drone-kaniko depends_on: [clone] settings: username: from_secret: docker_username password: from_secret: docker_password - repo: registry.odit.services/library/nginx-brotli + repo: library/nginx-brotli tags: - "${DRONE_TAG}" + cache: true registry: registry.odit.services - mtu: 1000 - name: sign_image image: registry.odit.services/hub/library/alpine:edge depends_on: [build_tag] @@ -129,19 +126,18 @@ type: kubernetes name: build:nightly steps: - name: docker release - image: plugins/docker - user: 0 + image: registry.odit.services/library/drone-kaniko depends_on: [clone] settings: username: from_secret: docker_username password: from_secret: docker_password - repo: registry.odit.services/library/nginx-brotli + repo: library/nginx-brotli tags: - nightly + cache: true registry: registry.odit.services - mtu: 1000 trigger: branch: - main @@ -178,20 +174,19 @@ steps: ssh_key: from_secret: git_ssh - name: docker release - image: plugins/docker - user: 0 - depends_on: [clone] + image: registry.odit.services/library/drone-kaniko + depends_on: [bump_prepatch] settings: username: from_secret: docker_username password: from_secret: docker_password - repo: registry.odit.services/library/nginx-brotli + repo: library/nginx-brotli tags: - weekly - "${DRONE_STAGE_STARTED}" + cache: true registry: registry.odit.services - mtu: 1000 trigger: branch: - main @@ -200,20 +195,20 @@ trigger: cron: include: - weekly ---- -kind: pipeline -type: kubernetes -name: build:pr -steps: - - name: docker release - image: plugins/docker - user: 0 - depends_on: [clone] - settings: - dry_run: true - tags: - - "PR-${DRONE_STAGE_STARTED}" - mtu: 1000 -trigger: - event: - - pull_request +# --- +# kind: pipeline +# type: kubernetes +# name: build:pr +# steps: +# - name: docker release +# image: plugins/docker +# user: 0 +# depends_on: [clone] +# settings: +# dry_run: true +# tags: +# - "PR-${DRONE_STAGE_STARTED}" +# mtu: 1000 +# trigger: +# event: +# - pull_request -- 2.47.2