Compare commits
	
		
			148 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| ba63392fb0 | |||
| e983d295da | |||
| 809f2d8a37 | |||
| 89088818fd | |||
| 6f2fa2d360 | |||
| 291501175d | |||
| 182b0dad92 | |||
| 47c46e31c6 | |||
| 8aea9626d2 | |||
| 3ec3a6f29f | |||
| 7a5876cabd | |||
| 50471b0ef3 | |||
| 00d1d8e182 | |||
| 94da21924c | |||
| aabc06bfa7 | |||
| e2bb46416e | |||
| b1ae682e7f | |||
| bb214c6269 | |||
| 8dd6160344 | |||
| 37714d641d | |||
| 800c23d940 | |||
| 8d45d45170 | |||
| 9a3a36b58e | |||
| 1bc1798e33 | |||
| c918edbc07 | |||
| d3dc6e3e84 | |||
| fdf16d13bd | |||
| f1a248ff08 | |||
| e6d3344bed | |||
| 3ea0582015 | |||
| ae7a49997a | |||
| 543cd38529 | |||
| 5932b34885 | |||
| 2bc89310d5 | |||
| 5c1083106b | |||
| d1d979b7c1 | |||
| 74cca14efa | |||
| f10c2510cc | |||
| 4cb224a5a6 | |||
| b366f1a3b8 | |||
| e624741c10 | |||
| b85360c9a9 | |||
| a48dd3fa2a | |||
| b1daa08c83 | |||
| 5ddd6e36dd | |||
| 0db8e998e3 | |||
| b2af0ecf6c | |||
| 011a88d1c8 | |||
| 1b8799633f | |||
| 50345bfded | |||
| 757ed2dda1 | |||
| 04a1e560b1 | |||
| 1ec5f62e10 | |||
| 8c9274e772 | |||
| 9b8b6b175d | |||
| fb7acd1307 | |||
| f4f5727ced | |||
| 917729b00d | |||
| 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 | |||
| ebac3eaaa6 | |||
| 1e1ea14b18 | 
							
								
								
									
										71
									
								
								.drone.yml
									
									
									
									
									
								
							
							
						
						
									
										71
									
								
								.drone.yml
									
									
									
									
									
								
							| @@ -47,7 +47,7 @@ name: build:latest | |||||||
| steps: | steps: | ||||||
|   - name: bump_patch |   - name: bump_patch | ||||||
|     depends_on: [clone] |     depends_on: [clone] | ||||||
|     image: registry.odit.services/hub/library/node:18.3.0-alpine3.15 |     image: registry.odit.services/hub/library/node:18.6.0-alpine3.15 | ||||||
|     commands: |     commands: | ||||||
|       - apk add git |       - apk add git | ||||||
|       - git config --global push.default current |       - git config --global push.default current | ||||||
| @@ -68,19 +68,17 @@ steps: | |||||||
|       ssh_key: |       ssh_key: | ||||||
|         from_secret: git_ssh |         from_secret: git_ssh | ||||||
|   - name: docker release |   - name: docker release | ||||||
|     image: plugins/docker |     image: registry.odit.services/library/drone-kaniko | ||||||
|     depends_on: [clone] |     depends_on: [bump_patch] | ||||||
|     user: 0 |  | ||||||
|     settings: |     settings: | ||||||
|       username: |       username: | ||||||
|         from_secret: docker_username |         from_secret: docker_username | ||||||
|       password: |       password: | ||||||
|         from_secret: docker_password |         from_secret: docker_password | ||||||
|       repo: registry.odit.services/library/nginx-brotli |       repo: library/nginx-brotli | ||||||
|       tags: |       tags: | ||||||
|         - latest |         - latest | ||||||
|       registry: registry.odit.services |       cache: true | ||||||
|       mtu: 1000 |  | ||||||
| trigger: | trigger: | ||||||
|   branch: |   branch: | ||||||
|     - main |     - main | ||||||
| @@ -90,19 +88,18 @@ type: kubernetes | |||||||
| name: build:tags | name: build:tags | ||||||
| steps: | steps: | ||||||
|   - name: build_tag |   - name: build_tag | ||||||
|     image: plugins/docker |     image: registry.odit.services/library/drone-kaniko | ||||||
|     user: 0 |  | ||||||
|     depends_on: [clone] |     depends_on: [clone] | ||||||
|     settings: |     settings: | ||||||
|       username: |       username: | ||||||
|         from_secret: docker_username |         from_secret: docker_username | ||||||
|       password: |       password: | ||||||
|         from_secret: docker_password |         from_secret: docker_password | ||||||
|       repo: registry.odit.services/library/nginx-brotli |       repo: library/nginx-brotli | ||||||
|       tags: |       tags: | ||||||
|         - "${DRONE_TAG}" |         - "${DRONE_TAG}" | ||||||
|  |       cache: true | ||||||
|       registry: registry.odit.services |       registry: registry.odit.services | ||||||
|       mtu: 1000 |  | ||||||
|   - name: sign_image |   - name: sign_image | ||||||
|     image: registry.odit.services/hub/library/alpine:edge |     image: registry.odit.services/hub/library/alpine:edge | ||||||
|     depends_on: [build_tag] |     depends_on: [build_tag] | ||||||
| @@ -129,19 +126,18 @@ type: kubernetes | |||||||
| name: build:nightly | name: build:nightly | ||||||
| steps: | steps: | ||||||
|   - name: docker release |   - name: docker release | ||||||
|     image: plugins/docker |     image: registry.odit.services/library/drone-kaniko | ||||||
|     user: 0 |  | ||||||
|     depends_on: [clone] |     depends_on: [clone] | ||||||
|     settings: |     settings: | ||||||
|       username: |       username: | ||||||
|         from_secret: docker_username |         from_secret: docker_username | ||||||
|       password: |       password: | ||||||
|         from_secret: docker_password |         from_secret: docker_password | ||||||
|       repo: registry.odit.services/library/nginx-brotli |       repo: library/nginx-brotli | ||||||
|       tags: |       tags: | ||||||
|         - nightly |         - nightly | ||||||
|  |       cache: true | ||||||
|       registry: registry.odit.services |       registry: registry.odit.services | ||||||
|       mtu: 1000 |  | ||||||
| trigger: | trigger: | ||||||
|   branch: |   branch: | ||||||
|     - main |     - main | ||||||
| @@ -157,7 +153,7 @@ name: build:weekly | |||||||
| steps: | steps: | ||||||
|   - name: bump_prepatch |   - name: bump_prepatch | ||||||
|     depends_on: [clone] |     depends_on: [clone] | ||||||
|     image: registry.odit.services/hub/library/node:18.3.0-alpine3.15 |     image: registry.odit.services/hub/library/node:18.6.0-alpine3.15 | ||||||
|     commands: |     commands: | ||||||
|       - apk add git |       - apk add git | ||||||
|       - git config --global push.default current |       - git config --global push.default current | ||||||
| @@ -178,20 +174,19 @@ steps: | |||||||
|       ssh_key: |       ssh_key: | ||||||
|         from_secret: git_ssh |         from_secret: git_ssh | ||||||
|   - name: docker release |   - name: docker release | ||||||
|     image: plugins/docker |     image: registry.odit.services/library/drone-kaniko | ||||||
|     user: 0 |     depends_on: [bump_prepatch] | ||||||
|     depends_on: [clone] |  | ||||||
|     settings: |     settings: | ||||||
|       username: |       username: | ||||||
|         from_secret: docker_username |         from_secret: docker_username | ||||||
|       password: |       password: | ||||||
|         from_secret: docker_password |         from_secret: docker_password | ||||||
|       repo: registry.odit.services/library/nginx-brotli |       repo: library/nginx-brotli | ||||||
|       tags: |       tags: | ||||||
|         - weekly |         - weekly | ||||||
|         - "${DRONE_STAGE_STARTED}" |         - "${DRONE_STAGE_STARTED}" | ||||||
|  |       cache: true | ||||||
|       registry: registry.odit.services |       registry: registry.odit.services | ||||||
|       mtu: 1000 |  | ||||||
| trigger: | trigger: | ||||||
|   branch: |   branch: | ||||||
|     - main |     - main | ||||||
| @@ -200,20 +195,20 @@ 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 | ||||||
|     user: 0 | #     user: 0 | ||||||
|     depends_on: [clone] | #     depends_on: [clone] | ||||||
|     settings: | #     settings: | ||||||
|       dry_run: true | #       dry_run: true | ||||||
|       tags: | #       tags: | ||||||
|         - "PR-${DRONE_STAGE_STARTED}" | #         - "PR-${DRONE_STAGE_STARTED}" | ||||||
|       mtu: 1000 | #       mtu: 1000 | ||||||
| trigger: | # trigger: | ||||||
|   event: | #   event: | ||||||
|     - pull_request | #     - 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 NGX_BROTLI_COMMIT=9aec15e2aa6feea2113119ba06460af70ab3ea62 | ||||||
| ARG CONFIG="\ | ARG CONFIG="\ | ||||||
| 		--prefix=/etc/nginx \ | 		--prefix=/etc/nginx \ | ||||||
| @@ -64,7 +65,7 @@ RUN \ | |||||||
| 		zlib-dev \ | 		zlib-dev \ | ||||||
| 		linux-headers \ | 		linux-headers \ | ||||||
| 		curl \ | 		curl \ | ||||||
| 		gnupg1 \ | 		# gnupg \ | ||||||
| 		libxslt-dev \ | 		libxslt-dev \ | ||||||
| 		gd-dev \ | 		gd-dev \ | ||||||
| 		geoip-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 \ | 	&& 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 \ |         && sha512sum nginx.tar.gz nginx.tar.gz.asc \ | ||||||
| 	&& export GNUPGHOME="$(mktemp -d)" \ | 	&& export GNUPGHOME="$(mktemp -d)" \ | ||||||
| 	&& gpg --import /tmp/nginx.pub \ | 	# && gpg --import /tmp/nginx.pub \ | ||||||
| 	&& gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \ | 	# && gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \ | ||||||
| 	&& mkdir -p /usr/src \ | 	&& mkdir -p /usr/src \ | ||||||
| 	&& tar -zxC /usr/src -f nginx.tar.gz | 	&& tar -zxC /usr/src -f nginx.tar.gz | ||||||
|  |  | ||||||
| @@ -145,7 +146,6 @@ COPY --from=0 /usr/bin/envsubst /usr/local/bin/envsubst | |||||||
| RUN \ | RUN \ | ||||||
| 	addgroup -S nginx \ | 	addgroup -S nginx \ | ||||||
| 	&& adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx 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) \ | 	&& apk add --no-cache --virtual .nginx-rundeps tzdata $(cat /tmp/runDeps.txt) \ | ||||||
| 	&& rm /tmp/runDeps.txt \ | 	&& rm /tmp/runDeps.txt \ | ||||||
| 	&& ln -s /usr/lib/nginx/modules /etc/nginx/modules \ | 	&& 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 | EXPOSE 80 443 | ||||||
|  |  | ||||||
| STOPSIGNAL SIGTERM | STOPSIGNAL SIGQUIT | ||||||
|  |  | ||||||
| CMD ["nginx", "-g", "daemon off;"] | ENTRYPOINT ["nginx"] | ||||||
|  | CMD ["-g", "daemon off;"] | ||||||
| @@ -1,6 +1,6 @@ | |||||||
| { | { | ||||||
|   "name": "nginx-brotli", |   "name": "nginx-brotli", | ||||||
|   "version": "3.15.43", |   "version": "3.15.183", | ||||||
|   "description": "NGINX Base Image feat. brotli", |   "description": "NGINX Base Image feat. brotli", | ||||||
|   "repository": { |   "repository": { | ||||||
|     "type": "git", |     "type": "git", | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user