Compare commits

..

38 Commits

Author SHA1 Message Date
cf28697732 🚀RELEASE 3.15.100-0 [CI SKIP] 2022-08-28 00:21:51 +00:00
fc20ed668d 🚀RELEASE 3.15.99 [CI SKIP] 2022-08-27 00:21:25 +00:00
9bffb4b9e1 🚀RELEASE 3.15.98 [CI SKIP] 2022-08-26 00:21:26 +00:00
288f663dd5 🚀RELEASE 3.15.97 [CI SKIP] 2022-08-25 00:21:23 +00:00
5c1bb07237 🚀RELEASE 3.15.96 [CI SKIP] 2022-08-24 00:21:22 +00:00
1e8fc5291a 🚀RELEASE 3.15.95 [CI SKIP] 2022-08-23 00:21:16 +00:00
f0dd913d58 🚀RELEASE 3.15.94 [CI SKIP] 2022-08-21 00:21:37 +00:00
6a336b7aec 🚀RELEASE 3.15.93 [CI SKIP] 2022-08-19 00:21:44 +00:00
4e353fd237 🚀RELEASE 3.15.92 [CI SKIP] 2022-08-17 00:21:27 +00:00
bc141c61dc 🚀RELEASE 3.15.91 [CI SKIP] 2022-08-15 00:21:22 +00:00
8f6b4e5d09 🚀RELEASE 3.15.90 [CI SKIP] 2022-08-14 00:21:34 +00:00
52d049e2c8 🚀RELEASE 3.15.89 [CI SKIP] 2022-08-13 00:21:25 +00:00
5b626e47eb 🚀RELEASE 3.15.88 [CI SKIP] 2022-08-12 00:21:26 +00:00
c207dbf2d8 🚀RELEASE 3.15.87 [CI SKIP] 2022-08-11 00:21:19 +00:00
6d64742528 🚀RELEASE 3.15.86 [CI SKIP] 2022-08-10 00:21:18 +00:00
4e69e6c566 🚀RELEASE 3.15.85 [CI SKIP] 2022-08-09 00:21:24 +00:00
8cfe23be17 🚀RELEASE 3.15.84 [CI SKIP] 2022-08-08 00:21:27 +00:00
6e269ccb74 🚀RELEASE 3.15.83 [CI SKIP] 2022-08-07 00:21:37 +00:00
75fab015bc 🚀RELEASE 3.15.82 [CI SKIP] 2022-08-06 00:21:23 +00:00
57260fcf79 🚀RELEASE 3.15.81 [CI SKIP] 2022-08-05 00:21:33 +00:00
8136076aed 🚀RELEASE 3.15.80 [CI SKIP] 2022-07-31 00:21:40 +00:00
ead02ade33 🚀RELEASE 3.15.79 [CI SKIP] 2022-07-30 00:21:27 +00:00
40fc8db5a9 🚀RELEASE 3.15.78 [CI SKIP] 2022-07-29 00:21:25 +00:00
b0104ff31d 🚀RELEASE 3.15.77 [CI SKIP] 2022-07-28 00:21:24 +00:00
9ee84da4af 🚀RELEASE 3.15.76 [CI SKIP] 2022-07-27 00:21:23 +00:00
d1755e0b76 🚀RELEASE 3.15.75 [CI SKIP] 2022-07-24 00:21:33 +00:00
459cd42fb8 🚀RELEASE 3.15.74 [CI SKIP] 2022-07-23 00:21:27 +00:00
f8ab36a970 🚀RELEASE 3.15.73 [CI SKIP] 2022-07-22 00:21:23 +00:00
e9b3f7a56b 🚀RELEASE 3.15.72 [CI SKIP] 2022-07-21 00:21:29 +00:00
29ba1c3cb7 🚀RELEASE 3.15.71 [CI SKIP] 2022-07-20 00:18:04 +00:00
152c7418ce 🚀RELEASE 3.15.70 [CI SKIP] 2022-07-19 00:17:52 +00:00
89dca28155 Typo
Some checks reported errors
continuous-integration/drone/push Build was killed
2022-07-18 18:30:56 +02:00
8654643138 🚀RELEASE 3.15.69 [CI SKIP] 2022-07-18 18:30:08 +02:00
46332f4bfc Merge pull request 'Update registry.odit.services/hub/library/alpine Docker tag to v3.16' (#8) from renovate/registry.odit.services-hub-library-alpine-3.x into main
Some checks reported errors
continuous-integration/drone/push Build was killed
Reviewed-on: #8
2022-07-18 16:29:20 +00:00
9ef64cd501 Updated ci confi 2022-07-18 18:28:53 +02:00
8678157b65 Alpine 3.15 2022-07-18 18:25:28 +02:00
ebac3eaaa6 Merge branch 'main' into renovate/registry.odit.services-hub-library-alpine-3.x 2022-05-24 14:43:52 +00:00
1e1ea14b18 Update registry.odit.services/hub/library/alpine Docker tag to v3.16 2022-05-23 19:17:40 +00:00
3 changed files with 40 additions and 44 deletions

View File

@@ -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
@@ -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

View File

@@ -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;"]

View File

@@ -1,6 +1,6 @@
{ {
"name": "nginx-brotli", "name": "nginx-brotli",
"version": "3.15.68", "version": "3.15.100-0",
"description": "NGINX Base Image feat. brotli", "description": "NGINX Base Image feat. brotli",
"repository": { "repository": {
"type": "git", "type": "git",