Compare commits
	
		
			1 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| c076d6b209 | 
							
								
								
									
										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.6.0-alpine3.15 |     image: registry.odit.services/hub/library/node:18.1.0-alpine3.15 | ||||||
|     commands: |     commands: | ||||||
|       - apk add git |       - apk add git | ||||||
|       - git config --global push.default current |       - git config --global push.default current | ||||||
| @@ -68,17 +68,19 @@ steps: | |||||||
|       ssh_key: |       ssh_key: | ||||||
|         from_secret: git_ssh |         from_secret: git_ssh | ||||||
|   - name: docker release |   - name: docker release | ||||||
|     image: registry.odit.services/library/drone-kaniko |     image: plugins/docker | ||||||
|     depends_on: [bump_patch] |     depends_on: [clone] | ||||||
|  |     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: library/nginx-brotli |       repo: registry.odit.services/library/nginx-brotli | ||||||
|       tags: |       tags: | ||||||
|         - latest |         - latest | ||||||
|       cache: true |       registry: registry.odit.services | ||||||
|  |       mtu: 1000 | ||||||
| trigger: | trigger: | ||||||
|   branch: |   branch: | ||||||
|     - main |     - main | ||||||
| @@ -88,18 +90,19 @@ type: kubernetes | |||||||
| name: build:tags | name: build:tags | ||||||
| steps: | steps: | ||||||
|   - name: build_tag |   - name: build_tag | ||||||
|     image: registry.odit.services/library/drone-kaniko |     image: plugins/docker | ||||||
|  |     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: library/nginx-brotli |       repo: registry.odit.services/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] | ||||||
| @@ -126,18 +129,19 @@ type: kubernetes | |||||||
| name: build:nightly | name: build:nightly | ||||||
| steps: | steps: | ||||||
|   - name: docker release |   - name: docker release | ||||||
|     image: registry.odit.services/library/drone-kaniko |     image: plugins/docker | ||||||
|  |     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: library/nginx-brotli |       repo: registry.odit.services/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 | ||||||
| @@ -153,7 +157,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.6.0-alpine3.15 |     image: registry.odit.services/hub/library/node:18.1.0-alpine3.15 | ||||||
|     commands: |     commands: | ||||||
|       - apk add git |       - apk add git | ||||||
|       - git config --global push.default current |       - git config --global push.default current | ||||||
| @@ -174,19 +178,20 @@ steps: | |||||||
|       ssh_key: |       ssh_key: | ||||||
|         from_secret: git_ssh |         from_secret: git_ssh | ||||||
|   - name: docker release |   - name: docker release | ||||||
|     image: registry.odit.services/library/drone-kaniko |     image: plugins/docker | ||||||
|     depends_on: [bump_prepatch] |     user: 0 | ||||||
|  |     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: library/nginx-brotli |       repo: registry.odit.services/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 | ||||||
| @@ -195,20 +200,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,5 +1,4 @@ | |||||||
| ARG ALPINE_VERSION=3.15 | ARG NGINX_VERSION=1.20.1 | ||||||
| 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 \ | ||||||
| @@ -65,7 +64,7 @@ RUN \ | |||||||
| 		zlib-dev \ | 		zlib-dev \ | ||||||
| 		linux-headers \ | 		linux-headers \ | ||||||
| 		curl \ | 		curl \ | ||||||
| 		# gnupg \ | 		gnupg1 \ | ||||||
| 		libxslt-dev \ | 		libxslt-dev \ | ||||||
| 		gd-dev \ | 		gd-dev \ | ||||||
| 		geoip-dev \ | 		geoip-dev \ | ||||||
| @@ -92,8 +91,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 | ||||||
|  |  | ||||||
| @@ -146,6 +145,7 @@ 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,7 +160,6 @@ COPY nginx.vh.default.conf /etc/nginx/conf.d/default.conf | |||||||
|  |  | ||||||
| EXPOSE 80 443 | EXPOSE 80 443 | ||||||
|  |  | ||||||
| STOPSIGNAL SIGQUIT | STOPSIGNAL SIGTERM | ||||||
|  |  | ||||||
| ENTRYPOINT ["nginx"] | CMD ["nginx", "-g", "daemon off;"] | ||||||
| CMD ["-g", "daemon off;"] |  | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| { | { | ||||||
|   "name": "nginx-brotli", |   "name": "nginx-brotli", | ||||||
|   "version": "3.15.70", |   "version": "3.15.15", | ||||||
|   "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