Compare commits
	
		
			64 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 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 | |||
| 
						
						
							
						
						f932822db7
	
				 | 
					
					
						|||
| 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.65",
 | 
					  "version": "3.15.121",
 | 
				
			||||||
  "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