🚀RELEASE 3.15.11 [CI SKIP]

Reviewed-on: #5

.drone.yml

@@ -12,12 +12,61 @@ get:
   path: odit-registry-builder
   name: password
 
+---
+kind: secret
+name: gitea_token
+get:
+  path: odit-git-bot
+  name: apikey
+
+---
+kind: secret
+name: git_ssh
+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
+    commands:
+      - apk add git
+      - git config --global push.default current
+      - git branch --set-upstream-to=origin/main main
+      - yarn
+      - yarn release:patch
+      - git pull
+  - name: push to repo
+    image: appleboy/drone-git-push
+    depends_on: [bump_patch]
+    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: plugins/docker
     depends_on: [clone]
@@ -32,17 +81,15 @@ steps:
         - latest
       registry: registry.odit.services
       mtu: 1000
-    when:
+trigger:
-      branch:
+  branch:
-        - main
+    - main
-
 ---
 kind: pipeline
 type: kubernetes
 name: build:tags
-
 steps:
-  - name: build $DRONE_TAG
+  - name: build_tag
     image: plugins/docker
     user: 0
     depends_on: [clone]
@@ -53,18 +100,33 @@ steps:
         from_secret: docker_password
       repo: registry.odit.services/library/nginx-brotli
       tags:
-        - '${DRONE_TAG}'
+        - "${DRONE_TAG}"
       registry: registry.odit.services
       mtu: 1000
+  - name: sign_image
+    image: registry.odit.services/hub/library/alpine:edge
+    depends_on: [build_tag]
+    commands:
+      - apk add cosign docker
+      - echo $COSIGN_KEY | sed 's/<br>/\n/g' > cosign.key
+      - echo $DOCKER_PASSWORD | docker login registry.odit.services -u $DOCKER_USERNAME --password-stdin
+      - "cosign sign --key cosign.key registry.odit.services/library/nginx-brotli:${DRONE_TAG}"
+    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
+    - tag
-
 ---
 kind: pipeline
 type: kubernetes
 name: build:nightly
-
 steps:
   - name: docker release
     image: plugins/docker
@@ -80,12 +142,78 @@ steps:
         - nightly
       registry: registry.odit.services
       mtu: 1000
-    when:
+trigger:
-      branch:
+  branch:
-        - main
+    - main
+  event:
+    - cron
+  cron:
+    include:
+      - nightly
+---
+kind: pipeline
+type: kubernetes
+name: build:weekly
+steps:
+  - name: bump_prepatch
+    depends_on: [clone]
+    image: registry.odit.services/hub/library/node:18.1.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: plugins/docker
+    user: 0
+    depends_on: [clone]
+    settings:
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      repo: registry.odit.services/library/nginx-brotli
+      tags:
+        - weekly
+        - "${DRONE_STAGE_STARTED}"
+      registry: registry.odit.services
+      mtu: 1000
+trigger:
+  branch:
+    - main
+  event:
+    - cron
+  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:
-  - cron
+    - pull_request
-  cron:
-    exclude:
-    - nightly

.gitignore

@@ -0,0 +1,2 @@
+package-lock.json
+node_modules

Dockerfile

@@ -47,7 +47,7 @@ ARG CONFIG="\
 		--add-module=/usr/src/ngx_brotli \
 	"
 
-FROM registry.odit.services/hub/library/alpine:3.13
+FROM registry.odit.services/hub/library/alpine:3.15
 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.13
+FROM registry.odit.services/hub/library/alpine:3.15
 ARG NGINX_VERSION
 
 COPY --from=0 /tmp/runDeps.txt /tmp/runDeps.txt

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

@@ -0,0 +1,34 @@
+{
+  "name": "nginx-brotli",
+  "version": "3.15.11",
+  "description": "NGINX Base Image feat. brotli",
+  "repository": {
+    "type": "git",
+    "url": "git@git.odit.services:odit/nginx-brotli.git"
+  },
+  "license": "MIT",
+  "devDependencies": {
+    "release-it": "^15.0.0"
+  },
+  "scripts": {
+    "release": "release-it",
+    "release:patch": "release-it --patch --ci",
+    "release:prepatch": "release-it --prePatch --preRelease --ci"
+  },
+  "release-it": {
+    "git": {
+      "commit": true,
+      "requireCleanWorkingDir": false,
+      "requireUpstream": false,
+      "requireBranch": "main",
+      "commitMessage": "🚀RELEASE ${version} [CI SKIP]",
+      "push": false,
+      "tag": true,
+      "tagName": "${version}",
+      "tagAnnotation": "${version}"
+    },
+    "npm": {
+      "publish": false
+    }
+  }
+}

renovate.json

@@ -0,0 +1,8 @@
+{
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "dependencyDashboard": true,
+    "baseBranches": ["main"],
+    "addLabels": ["status:review_needed", "enhancement", "priority:medium"],
+    "reviewers": ["niggl", "philipp"]
+  }
+