🚀RELEASE 3.15.29 [CI SKIP]

Reviewed-on: #7

.drone.yml

@@ -26,19 +26,35 @@ 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.2.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
     depends_on: [bump_patch]
@@ -47,7 +63,7 @@ steps:
       author_email: bot@odit.services
       followtags: true
       branch: main
-      remote: git@git.odit.services:lfk/scanclient-live.git
+      remote: git@git.odit.services:odit/nginx-brotli.git
       skip_verify: true
       ssh_key:
         from_secret: git_ssh
@@ -68,14 +84,12 @@ steps:
 trigger:
   branch:
     - main
-
 ---
 kind: pipeline
 type: kubernetes
 name: build:tags
-
 steps:
-  - name: build $DRONE_TAG
+  - name: build_tag
     image: plugins/docker
     user: 0
     depends_on: [clone]
@@ -89,23 +103,30 @@ steps:
         - "${DRONE_TAG}"
       registry: registry.odit.services
       mtu: 1000
-  - name: gitea_release
+  - name: sign_image
-    image: plugins/gitea-release
+    image: registry.odit.services/hub/library/alpine:edge
-    settings:
+    depends_on: [build_tag]
-      title: Release ${DRONE_TAG}
+    commands:
-      note: "Pull: `docker pull registry.odit.services/library/nginx-brotli:${DRONE_TAG}`"
+      - apk add cosign docker
-      api_key:
+      - echo $COSIGN_KEY | sed 's/<br>/\n/g' > cosign.key
-        from_secret: gitea_token
+      - echo $DOCKER_PASSWORD | docker login registry.odit.services -u $DOCKER_USERNAME --password-stdin
-      base_url: https://git.odit.services
+      - "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
-
 ---
 kind: pipeline
 type: kubernetes
 name: build:nightly
-
 steps:
   - name: docker release
     image: plugins/docker
@@ -129,13 +150,33 @@ trigger:
   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.2.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
@@ -159,12 +200,10 @@ trigger:
   cron:
     include:
       - weekly
-
 ---
 kind: pipeline
 type: kubernetes
 name: build:pr
-
 steps:
   - name: docker release
     image: plugins/docker

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.0",
+  "version": "3.15.29",
   "description": "NGINX Base Image feat. brotli",
   "repository": {
     "type": "git",
@@ -11,15 +11,18 @@
     "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": {
       "commit": true,
       "requireCleanWorkingDir": false,
+      "requireUpstream": false,
       "requireBranch": "main",
-      "commitMessage": "🚀RELEASE ${version}",
+      "commitMessage": "🚀RELEASE ${version} [CI SKIP]",
-      "push": true,
+      "push": false,
       "tag": true,
       "tagName": "${version}",
       "tagAnnotation": "${version}"
@@ -28,4 +31,4 @@
       "publish": false
     }
   }
-}
+}