🚀RELEASE 3.15.171 [CI SKIP]

Reviewed-on: #8

.drone.yml

@@ -26,21 +26,34 @@ get:
   path: odit-git-bot
   name: sshkey
 
+---
+kind: secret
+name: cosign_key
+get:
+  path: cosign
+  name: cosign.key
+
+---
+kind: secret
+name: cosign_password
+get:
+  path: cosign
+  name: cosign.password
+
 ---
 kind: pipeline
 type: kubernetes
 name: build:latest
-
 steps:
   - name: bump_patch
     depends_on: [clone]
-    image: registry.odit.services/hub/library/node:18.1.0-alpine3.15
+    image: registry.odit.services/hub/library/node:18.6.0-alpine3.15
     commands:
       - apk add git
       - git config --global push.default current
       - git branch --set-upstream-to=origin/main main
       - yarn
-      - yarn release
+      - yarn release:patch
       - git pull
   - name: push to repo
     image: appleboy/drone-git-push
@@ -55,75 +68,76 @@ 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
-
 ---
 kind: pipeline
 type: kubernetes
 name: build:tags
-
 steps:
-  - name: build $DRONE_TAG
+  - name: build_tag
-    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
-  - name: gitea_release
+    image: registry.odit.services/hub/library/alpine:edge
-    image: plugins/gitea-release
+    depends_on: [build_tag]
-    settings:
+    commands:
-      title: Release ${DRONE_TAG}
+      - apk add cosign docker
-      note: "Pull: `docker pull registry.odit.services/library/nginx-brotli:${DRONE_TAG}`"
+      - echo $COSIGN_KEY | sed 's/<br>/\n/g' > cosign.key
-      api_key:
+      - echo $DOCKER_PASSWORD | docker login registry.odit.services -u $DOCKER_USERNAME --password-stdin
-        from_secret: gitea_token
+      - "cosign sign --key cosign.key registry.odit.services/library/nginx-brotli:${DRONE_TAG}"
-      base_url: https://git.odit.services
+    environment:
+      COSIGN_KEY:
+        from_secret: cosign_key
+      COSIGN_PASSWORD:
+        from_secret: cosign_password
+      DOCKER_PASSWORD:
+        from_secret: docker_password
+      DOCKER_USERNAME:
+        from_secret: docker_username
 trigger:
   event:
     - tag
-
 ---
 kind: pipeline
 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
@@ -132,28 +146,47 @@ trigger:
   cron:
     include:
       - nightly
-
 ---
 kind: pipeline
 type: kubernetes
 name: build:weekly
-
 steps:
-  - name: docker release
+  - name: bump_prepatch
-    image: plugins/docker
-    user: 0
     depends_on: [clone]
+    image: registry.odit.services/hub/library/node:18.6.0-alpine3.15
+    commands:
+      - apk add git
+      - git config --global push.default current
+      - git branch --set-upstream-to=origin/main main
+      - yarn
+      - "yarn release:prepatch"
+      - git pull
+  - name: push to repo
+    image: appleboy/drone-git-push
+    depends_on: [bump_prepatch]
+    settings:
+      commit: false
+      author_email: bot@odit.services
+      followtags: true
+      branch: main
+      remote: git@git.odit.services:odit/nginx-brotli.git
+      skip_verify: true
+      ssh_key:
+        from_secret: git_ssh
+  - name: docker release
+    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
@@ -162,22 +195,20 @@ trigger:
   cron:
     include:
       - weekly
-
+# ---
----
+# kind: pipeline
-kind: pipeline
+# type: kubernetes
-type: kubernetes
+# name: build:pr
-name: build:pr
+# steps:
-
+#   - name: docker release
-steps:
+#     image: plugins/docker
-  - name: docker release
+#     user: 0
-    image: plugins/docker
+#     depends_on: [clone]
-    user: 0
+#     settings:
-    depends_on: [clone]
+#       dry_run: true
-    settings:
+#       tags:
-      dry_run: true
+#         - "PR-${DRONE_STAGE_STARTED}"
-      tags:
+#       mtu: 1000
-        - "PR-${DRONE_STAGE_STARTED}"
+# trigger:
-      mtu: 1000
+#   event:
-trigger:
+#     - pull_request
-  event:
-    - 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;"]

README.md

@@ -0,0 +1,33 @@
+<p align="center">
+  <a href="https://odit.services" target="blank"><img src="https://odit.services/img/profile-pic-no_bg.webp" width="200" alt="ODIT Logo" /></a>
+</p>
+
+
+  <p align="center">NGINX - Brotli</p>
+
+
+## Description
+
+A custom alpine based nginx image including Brotli for compression.
+
+## Build
+
+```bash
+docker build .
+```
+
+## Use
+* Docker Image: registry.odit.services/library/nginx-brotli
+* Webserver Folder Mount: /usr/share/nginx/html/
+* Nginx Config Mount: /etc/nginx/nginx.conf
+
+## Release a new version (triggers ci)
+```bash
+# pnpm
+pnpm i
+pnpm release
+
+# yarn
+yarn
+yarn release
+```

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nginx-brotli",
-  "version": "3.15.1",
+  "version": "3.15.171",
   "description": "NGINX Base Image feat. brotli",
   "repository": {
     "type": "git",
@@ -11,7 +11,9 @@
     "release-it": "^15.0.0"
   },
   "scripts": {
-    "release": "release-it --patch --ci"
+    "release": "release-it",
+    "release:patch": "release-it --patch --ci",
+    "release:prepatch": "release-it --prePatch --preRelease --ci"
   },
   "release-it": {
     "git": {