Merge pull request 'Update registry.odit.services/hub/library/alpine Docker tag to v3.16' (#8) from renovate/registry.odit.services-hub-library-alpine-3.x into main

Reviewed-on: #8

.drone.yml

@@ -68,19 +68,17 @@ steps:
       ssh_key:
         from_secret: git_ssh
   - name: docker release
-    image: plugins/docker
+    image: registry.odit.services/library/drone-kaniko
-    depends_on: [clone]
+    depends_on: [bump_patch]
-    user: 0
     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
+      cache: true
-      mtu: 1000
 trigger:
   branch:
     - main
@@ -89,20 +87,19 @@ kind: pipeline
 type: kubernetes
 name: build:tags
 steps:
-  - name: build_tag
+  - name: docker release
-    image: plugins/docker
+    image: registry.odit.services/library/drone-kaniko
-    user: 0
     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
+    image: registry.odit.services/library/drone-kaniko
-    user: 0
     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
+    image: registry.odit.services/library/drone-kaniko
-    user: 0
+    depends_on: [bump_prepatch]
-    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:
         - 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
+# kind: pipeline
-type: kubernetes
+# type: kubernetes
-name: build:pr
+# name: build:pr
-steps:
+# steps:
-  - name: docker release
+#   - name: docker release
-    image: plugins/docker
+#     image: plugins/docker
-    user: 0
+#     user: 0
-    depends_on: [clone]
+#     depends_on: [clone]
-    settings:
+#     settings:
-      dry_run: true
+#       dry_run: true
-      tags:
+#       tags:
-        - "PR-${DRONE_STAGE_STARTED}"
+#         - "PR-${DRONE_STAGE_STARTED}"
-      mtu: 1000
+#       mtu: 1000
-trigger:
+# trigger:
-  event:
+#   event:
-    - pull_request
+#     - pull_request

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 \
@@ -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 --import /tmp/nginx.pub \
-	&& gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
+	# && gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
 	&& mkdir -p /usr/src \
 	&& tar -zxC /usr/src -f nginx.tar.gz
 
@@ -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;"]