Compare commits
	
		
			140 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| abb85e1ac8 | |||
| 64299850ea | |||
| 72c6c198f4 | |||
| 818f22aace | |||
| 034cc03736 | |||
| ed15af0b48 | |||
| 645b90e2e4 | |||
| 24d6aea197 | |||
| a95c840377 | |||
| 4461fd9eba | |||
| 389e57981d | |||
| c8e247a8d2 | |||
| 0161940b61 | |||
| 9ee417afec | |||
| 5d9461ebb6 | |||
| dbb18cd901 | |||
| 1196544347 | |||
| 551f4d41bd | |||
| a2dd899317 | |||
| f501bc9151 | |||
| 12d04ada09 | |||
| 9b1afc6904 | |||
| fbdb6d4ccb | |||
| 97c9230051 | |||
| 221171a751 | |||
| 5fab92ef49 | |||
| fc20ed668d | |||
| 9bffb4b9e1 | |||
| 288f663dd5 | |||
| 5c1bb07237 | |||
| 1e8fc5291a | |||
| f0dd913d58 | |||
| 6a336b7aec | |||
| 4e353fd237 | |||
| bc141c61dc | |||
| 8f6b4e5d09 | |||
| 52d049e2c8 | |||
| 5b626e47eb | |||
| c207dbf2d8 | |||
| 6d64742528 | |||
| 4e69e6c566 | |||
| 8cfe23be17 | |||
| 6e269ccb74 | |||
| 75fab015bc | |||
| 57260fcf79 | |||
| 8136076aed | |||
| ead02ade33 | |||
| 40fc8db5a9 | |||
| b0104ff31d | |||
| 9ee84da4af | |||
| d1755e0b76 | |||
| 459cd42fb8 | |||
| f8ab36a970 | |||
| e9b3f7a56b | |||
| 29ba1c3cb7 | |||
| 152c7418ce | |||
| 89dca28155 | |||
| 8654643138 | |||
| 46332f4bfc | |||
| 9ef64cd501 | |||
| 8678157b65 | |||
| 8936d13742 | |||
| da4408558a | |||
| 95c7e015de | |||
| 79a085ac6e | |||
| dcb24d1e1a | |||
| 9d044ef6ec | |||
| f932822db7 | |||
| 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 | |||
| ebac3eaaa6 | |||
| 61b0d4669d | |||
| 517e2f3dcd | |||
| 73b53975b5 | |||
| 1e1ea14b18 | |||
| 7ef9c84dce | |||
| 71a2cb587b | |||
| f125a6ddfc | |||
| 08cb4ded9e | |||
| d926328e23 | |||
| 4deb1d53b7 | |||
| 3108e46f3d | |||
| 85f1e99153 | |||
| 93f3da858b | |||
| 5f41a56149 | |||
| e8aeb52a81 | |||
| 3d8edb129e | |||
| f0391ddfcf | |||
| 73ddccc66f | |||
| 556e51e87f | |||
| e9359ec998 | |||
| 6f86d1f007 | |||
| 8deefdbf38 | |||
| f4e1c1de18 | |||
| 90924d7bb3 | |||
| 584f7aa710 | |||
| 6d9eb25330 | |||
| 940d25b0c2 | |||
| 3ce730d822 | 
							
								
								
									
										73
									
								
								.drone.yml
									
									
									
									
									
								
							
							
						
						
									
										73
									
								
								.drone.yml
									
									
									
									
									
								
							| @@ -47,7 +47,7 @@ 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 | ||||
| @@ -68,19 +68,17 @@ steps: | ||||
|       ssh_key: | ||||
|         from_secret: git_ssh | ||||
|   - name: docker release | ||||
|     image: plugins/docker | ||||
|     depends_on: [clone] | ||||
|     user: 0 | ||||
|     image: registry.odit.services/library/drone-kaniko | ||||
|     depends_on: [bump_patch] | ||||
|     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 | ||||
|       mtu: 1000 | ||||
|       cache: true | ||||
| trigger: | ||||
|   branch: | ||||
|     - main | ||||
| @@ -90,19 +88,18 @@ type: kubernetes | ||||
| name: build:tags | ||||
| steps: | ||||
|   - name: build_tag | ||||
|     image: plugins/docker | ||||
|     user: 0 | ||||
|     image: registry.odit.services/library/drone-kaniko | ||||
|     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 | ||||
|     image: registry.odit.services/hub/library/alpine:edge | ||||
|     depends_on: [build_tag] | ||||
| @@ -129,19 +126,18 @@ type: kubernetes | ||||
| name: build:nightly | ||||
| steps: | ||||
|   - name: docker release | ||||
|     image: plugins/docker | ||||
|     user: 0 | ||||
|     image: registry.odit.services/library/drone-kaniko | ||||
|     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 | ||||
| @@ -157,7 +153,7 @@ name: build:weekly | ||||
| steps: | ||||
|   - name: bump_prepatch | ||||
|     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 | ||||
| @@ -167,7 +163,7 @@ steps: | ||||
|       - git pull | ||||
|   - name: push to repo | ||||
|     image: appleboy/drone-git-push | ||||
|     depends_on: [bump_patch] | ||||
|     depends_on: [bump_prepatch] | ||||
|     settings: | ||||
|       commit: false | ||||
|       author_email: bot@odit.services | ||||
| @@ -178,20 +174,19 @@ steps: | ||||
|       ssh_key: | ||||
|         from_secret: git_ssh | ||||
|   - name: docker release | ||||
|     image: plugins/docker | ||||
|     user: 0 | ||||
|     depends_on: [clone] | ||||
|     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 | ||||
| @@ -200,20 +195,20 @@ trigger: | ||||
|   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: | ||||
|     - pull_request | ||||
| # --- | ||||
| # 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: | ||||
| #     - pull_request | ||||
|   | ||||
							
								
								
									
										15
									
								
								Dockerfile
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								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 --batch --verify nginx.tar.gz.asc nginx.tar.gz \ | ||||
| 	# && gpg --import /tmp/nginx.pub \ | ||||
| 	# && 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;"] | ||||
							
								
								
									
										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.5", | ||||
|   "version": "3.15.125", | ||||
|   "description": "NGINX Base Image feat. brotli", | ||||
|   "repository": { | ||||
|     "type": "git", | ||||
| @@ -11,6 +11,7 @@ | ||||
|     "release-it": "^15.0.0" | ||||
|   }, | ||||
|   "scripts": { | ||||
|     "release": "release-it", | ||||
|     "release:patch": "release-it --patch --ci", | ||||
|     "release:prepatch": "release-it --prePatch --preRelease --ci" | ||||
|   }, | ||||
|   | ||||
		Reference in New Issue
	
	Block a user