Compare commits
	
		
			89 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 79a085ac6e | |||
| dcb24d1e1a | |||
| 9d044ef6ec | |||
| a53167644a | |||
| 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 | 
							
								
								
									
										76
									
								
								.drone.yml
									
									
									
									
									
								
							
							
						
						
									
										76
									
								
								.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.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 | ||||
|       - yarn release:patch | ||||
|       - git pull | ||||
|   - name: push to repo | ||||
|     image: appleboy/drone-git-push | ||||
| @@ -71,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] | ||||
| @@ -92,23 +103,30 @@ steps: | ||||
|         - "${DRONE_TAG}" | ||||
|       registry: registry.odit.services | ||||
|       mtu: 1000 | ||||
|   - name: gitea_release | ||||
|     image: plugins/gitea-release | ||||
|     settings: | ||||
|       title: Release ${DRONE_TAG} | ||||
|       note: "Pull: `docker pull registry.odit.services/library/nginx-brotli:${DRONE_TAG}`" | ||||
|       api_key: | ||||
|         from_secret: gitea_token | ||||
|       base_url: https://git.odit.services | ||||
|   - 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 | ||||
|  | ||||
| --- | ||||
| kind: pipeline | ||||
| type: kubernetes | ||||
| name: build:nightly | ||||
|  | ||||
| steps: | ||||
|   - name: docker release | ||||
|     image: plugins/docker | ||||
| @@ -132,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.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 | ||||
|     image: plugins/docker | ||||
|     user: 0 | ||||
| @@ -162,12 +200,10 @@ trigger: | ||||
|   cron: | ||||
|     include: | ||||
|       - weekly | ||||
|  | ||||
| --- | ||||
| kind: pipeline | ||||
| type: kubernetes | ||||
| name: build:pr | ||||
|  | ||||
| steps: | ||||
|   - name: docker release | ||||
|     image: plugins/docker | ||||
|   | ||||
							
								
								
									
										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 | ||||
| ``` | ||||
| @@ -1,6 +1,6 @@ | ||||
| { | ||||
|   "name": "nginx-brotli", | ||||
|   "version": "3.15.1", | ||||
|   "version": "3.15.66", | ||||
|   "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": { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user