Compare commits
360 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 166c995fd8 | |||
| 9b8d7233cd | |||
| a5f9a12649 | |||
| 0b798517f3 | |||
| 41a9521922 | |||
| 05e5f03541 | |||
| c856378245 | |||
| ce948d3e42 | |||
| 5fd733a490 | |||
| 7eebb994f1 | |||
| 35f6fea2d9 | |||
| 41883a7ac8 | |||
| 1836e13738 | |||
| 5c3ac60f07 | |||
| 45d41dbc18 | |||
| 6e7394efbb | |||
| e93d6e33fe | |||
| 12f0f89d4d | |||
| 91145a7b6a | |||
| 4b84e858ca | |||
| 2e284ca3ea | |||
| 4c3e407d5c | |||
| cc37c58867 | |||
| 12ff1c9819 | |||
| 5150e96e84 | |||
| e18a90ff82 | |||
| 67883fd429 | |||
| 473d0aa57f | |||
| d86cdc664b | |||
| b8b5162736 | |||
| a199b81fab | |||
| ee4e77f397 | |||
| dfbb6fc768 | |||
| da4b918573 | |||
| dcfe894f8b | |||
| cfeaa5cd04 | |||
| f5a75a53f4 | |||
| 639416d24f | |||
| 601b96a288 | |||
| a8fab1e02f | |||
| 36fd60343d | |||
| 64bbb04644 | |||
| 272a7abcee | |||
| 47d6999357 | |||
| 9d0ed27696 | |||
| 046d62f383 | |||
| d4bc107331 | |||
| fc7a2510d6 | |||
| e8584ec7f5 | |||
| 5437bbdd74 | |||
| 453736aa08 | |||
| 3bcd970539 | |||
| 8b3f9f1c51 | |||
| 64a74b2080 | |||
| ff6d83d89b | |||
| 3d6aa960de | |||
| 2f7e78ebdd | |||
| 8ffbb0623c | |||
| 532f32e240 | |||
| b932a6ad32 | |||
| 64cf215396 | |||
| 5f2ee3bda5 | |||
| 1523dc0b27 | |||
| c5d259cb70 | |||
| f58b26fb94 | |||
| 3d8b056926 | |||
| b8f9394594 | |||
| a860434130 | |||
| 37e0e91195 | |||
| e3a31e3d13 | |||
| 0e954da072 | |||
| b1154c0327 | |||
| d85cac04dd | |||
| 773909d4dc | |||
| 8371bb0cdf | |||
| 3c96e96b50 | |||
| 6edf953c63 | |||
| 6c6575a253 | |||
| fc07b41c68 | |||
| b6996e50a5 | |||
| 325bcfac83 | |||
| 521a619125 | |||
| 1e0a78789b | |||
| bd6c8e69fc | |||
| b8f19f3ee5 | |||
| 72b15acab4 | |||
| bbc5fa88c6 | |||
| ce49e22ad8 | |||
| 2a0be4c8ad | |||
| 4b306f588c | |||
| eae623ebd4 | |||
| 2ec2b06ef6 | |||
| dafc59ce0d | |||
| cf1be23808 | |||
| 699c84ace5 | |||
| 2d752093b3 | |||
| 2a459ec046 | |||
| 7a42ff65f3 | |||
| 04f53df759 | |||
| d5764d945f | |||
| ec295bf718 | |||
| 4076587afe | |||
| 8132e24641 | |||
| b9cf01dfe5 | |||
| 5ed7cca0e9 | |||
| 854aaa6380 | |||
| 36f1564094 | |||
| fe3b938a52 | |||
| d3a384e64f | |||
| fba87a0841 | |||
| f6af4064c2 | |||
| 59796e6bce | |||
| f1eed7bed7 | |||
| 85a4823dba | |||
| 05bfc8b37c | |||
| 5c6d49f6ca | |||
| 9c75f2cd30 | |||
| c648f8a4b1 | |||
| a80478c2fc | |||
| 891a8035d8 | |||
| b2bf3cc490 | |||
| 56afce02ed | |||
| 0f7083eb11 | |||
| 70ad2b8296 | |||
| 00387af2b3 | |||
| 91c69ecac1 | |||
| c492edbd24 | |||
| 3df8ab1daa | |||
| cf429cbf19 | |||
| 83f181b533 | |||
| 6418301baf | |||
| 74461a4014 | |||
| 302da9f5f1 | |||
| 3849bbea36 | |||
| dc8af38117 | |||
| 28f6b590d2 | |||
| 12861c90d9 | |||
| 2abd15130d | |||
| ecc1c36b5e | |||
| 46065615dc | |||
| 60f62c2b14 | |||
| 871c08bb1e | |||
| a756092fc2 | |||
| b79aaa90e6 | |||
| 1a919b2c95 | |||
| e8b81bd1bf | |||
| 6d1b9dae6f | |||
| bd63774e0c | |||
| 2229305805 | |||
| 64caeda6dc | |||
| 8fda040d9e | |||
| a620aa8632 | |||
| de223423a4 | |||
| a94683d9ab | |||
| 9660c5c4a1 | |||
| 440e8f5c99 | |||
| 4913eed6ea | |||
| cc158ee41c | |||
| 5d60106b96 | |||
| 03a417c9a1 | |||
| c1e33c4005 | |||
| 257c7c4966 | |||
| 0ad0598368 | |||
| 1f379d7388 | |||
| 56078ff840 | |||
| d99d15d82b | |||
| c6ea9c2956 | |||
| c4c3a8d15e | |||
| 231e378caa | |||
| 52e5421262 | |||
| f8066f61da | |||
| f62b5b7b67 | |||
| eb0d8d5888 | |||
| e1c3a486ee | |||
| 1ae359c904 | |||
| 75adde19c4 | |||
| 6a0b2c9fdf | |||
| 0d4ea0e917 | |||
| 4e1adb7956 | |||
| da3073b11a | |||
| 6cfbb6ac6b | |||
| a8dbfd21c4 | |||
| a541fea930 | |||
| 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 | |||
| 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 | |||
|
4deb1d53b7
|
71
.drone.yml
71
.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
|
||||
@@ -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;"]
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "nginx-brotli",
|
||||
"version": "3.15.21",
|
||||
"version": "3.15.366",
|
||||
"description": "NGINX Base Image feat. brotli",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
||||
Reference in New Issue
Block a user