Compare commits
102 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 98e6a459a8 | |||
| 14433d6251 | |||
| 3978eca2b7 | |||
| b50571720e | |||
| eb05308e4f | |||
| 7d5f4c5eef | |||
| c6851062c9 | |||
| cf85fc6524 | |||
| 08289f3978 | |||
| 25c11cb5c2 | |||
| e1bc794e2d | |||
| b0ecaa75bc | |||
| b12cc4d419 | |||
| 6a676d89a3 | |||
| 78182411af | |||
| db1a1ed5f0 | |||
| cc4dc5ef20 | |||
| a7ff91092c | |||
| 8f82629079 | |||
| 1cac370907 | |||
| f87eefd791 | |||
| 746d699285 | |||
| f9258d8943 | |||
| f363467d36 | |||
| 7818b5942a | |||
| 94eeb28f6c | |||
| b9e8923876 | |||
| 2070d3424a | |||
| e8f3992b91 | |||
|
88120a7bd0
|
|||
| d2acc6c444 | |||
| 10b711155e | |||
| 1bb5af569d | |||
| 8c2c3ff001 | |||
| 944d355b47 | |||
| e80298e546 | |||
| 6aab36ec2a | |||
| 3751f7434e | |||
| d6a9fcf77c | |||
| f448c67dbb | |||
| 4a968fd5ce | |||
| 354b8c6edb | |||
| 61b0d4669d | |||
| 517e2f3dcd | |||
| 73b53975b5 | |||
| 7ef9c84dce | |||
| 71a2cb587b | |||
| f125a6ddfc | |||
| 08cb4ded9e | |||
| d926328e23 | |||
|
4deb1d53b7
|
|||
| 3108e46f3d | |||
| 85f1e99153 | |||
| 93f3da858b | |||
| 5f41a56149 | |||
| e8aeb52a81 | |||
| 3d8edb129e | |||
| f0391ddfcf | |||
| 73ddccc66f | |||
| 556e51e87f | |||
|
e9359ec998
|
|||
| 6f86d1f007 | |||
|
8deefdbf38
|
|||
|
f4e1c1de18
|
|||
| 90924d7bb3 | |||
| 584f7aa710 | |||
|
6d9eb25330
|
|||
|
940d25b0c2
|
|||
| 3ce730d822 | |||
| 7164c54074 | |||
| 3835b00832 | |||
| b49a13670c | |||
|
d1e7eb751a
|
|||
|
f1cdf753ab
|
|||
| 9fc7fa989e | |||
|
9376b65be5
|
|||
|
901bb7ce80
|
|||
|
9d8b22d4e9
|
|||
|
b970ebe600
|
|||
|
e4d5d5e448
|
|||
|
c30fd6eadb
|
|||
|
275c9cb8c6
|
|||
|
544398c895
|
|||
|
8bdc6d6a15
|
|||
|
1f76c43a2a
|
|||
| e85a2c6e93 | |||
|
131494a7d8
|
|||
|
72805144ed
|
|||
|
ae5fde95d9
|
|||
|
673c294e22
|
|||
|
d0d24eb332
|
|||
|
3aaefd971b
|
|||
|
081b57d97f
|
|||
|
bd053c289f
|
|||
|
5fe28253e0
|
|||
|
848e1b43a3
|
|||
| 468c347039 | |||
|
a5743662e1
|
|||
|
4a17547efb
|
|||
|
2e3970a6c6
|
|||
|
78a82af315
|
|||
|
2915d0ad18
|
102
.drone.yml
102
.drone.yml
@@ -12,12 +12,61 @@ get:
|
|||||||
path: odit-registry-builder
|
path: odit-registry-builder
|
||||||
name: password
|
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
|
kind: pipeline
|
||||||
type: kubernetes
|
type: kubernetes
|
||||||
name: build:latest
|
name: build:latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
- name: bump_patch
|
||||||
|
depends_on: [clone]
|
||||||
|
image: registry.odit.services/hub/library/node:18.3.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
|
- name: docker release
|
||||||
image: plugins/docker
|
image: plugins/docker
|
||||||
depends_on: [clone]
|
depends_on: [clone]
|
||||||
@@ -32,17 +81,15 @@ steps:
|
|||||||
- latest
|
- latest
|
||||||
registry: registry.odit.services
|
registry: registry.odit.services
|
||||||
mtu: 1000
|
mtu: 1000
|
||||||
when:
|
trigger:
|
||||||
branch:
|
branch:
|
||||||
- main
|
- main
|
||||||
|
|
||||||
---
|
---
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
type: kubernetes
|
type: kubernetes
|
||||||
name: build:tags
|
name: build:tags
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: build $DRONE_TAG
|
- name: build_tag
|
||||||
image: plugins/docker
|
image: plugins/docker
|
||||||
user: 0
|
user: 0
|
||||||
depends_on: [clone]
|
depends_on: [clone]
|
||||||
@@ -56,15 +103,30 @@ steps:
|
|||||||
- "${DRONE_TAG}"
|
- "${DRONE_TAG}"
|
||||||
registry: registry.odit.services
|
registry: registry.odit.services
|
||||||
mtu: 1000
|
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:
|
trigger:
|
||||||
event:
|
event:
|
||||||
- tag
|
- tag
|
||||||
|
|
||||||
---
|
---
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
type: kubernetes
|
type: kubernetes
|
||||||
name: build:nightly
|
name: build:nightly
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: docker release
|
- name: docker release
|
||||||
image: plugins/docker
|
image: plugins/docker
|
||||||
@@ -88,13 +150,33 @@ trigger:
|
|||||||
cron:
|
cron:
|
||||||
include:
|
include:
|
||||||
- nightly
|
- nightly
|
||||||
|
|
||||||
---
|
---
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
type: kubernetes
|
type: kubernetes
|
||||||
name: build:weekly
|
name: build:weekly
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
- name: bump_prepatch
|
||||||
|
depends_on: [clone]
|
||||||
|
image: registry.odit.services/hub/library/node:18.3.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
|
- name: docker release
|
||||||
image: plugins/docker
|
image: plugins/docker
|
||||||
user: 0
|
user: 0
|
||||||
@@ -118,12 +200,10 @@ trigger:
|
|||||||
cron:
|
cron:
|
||||||
include:
|
include:
|
||||||
- weekly
|
- 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
|
||||||
|
|||||||
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
package-lock.json
|
||||||
|
node_modules
|
||||||
33
README.md
33
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
|
||||||
|
```
|
||||||
34
package.json
Normal file
34
package.json
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
{
|
||||||
|
"name": "nginx-brotli",
|
||||||
|
"version": "3.15.62",
|
||||||
|
"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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user