Compare commits

..

1 Commits

Author SHA1 Message Date
c076d6b209 🚀RELEASE 3.15.15 [CI SKIP] 2022-05-15 00:10:14 +00:00
3 changed files with 46 additions and 42 deletions

View File

@@ -47,7 +47,7 @@ name: build:latest
steps:
- name: bump_patch
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:
- apk add git
- git config --global push.default current
@@ -68,17 +68,19 @@ steps:
ssh_key:
from_secret: git_ssh
- name: docker release
image: registry.odit.services/library/drone-kaniko
depends_on: [bump_patch]
image: plugins/docker
depends_on: [clone]
user: 0
settings:
username:
from_secret: docker_username
password:
from_secret: docker_password
repo: library/nginx-brotli
repo: registry.odit.services/library/nginx-brotli
tags:
- latest
cache: true
registry: registry.odit.services
mtu: 1000
trigger:
branch:
- main
@@ -88,18 +90,19 @@ type: kubernetes
name: build:tags
steps:
- name: build_tag
image: registry.odit.services/library/drone-kaniko
image: plugins/docker
user: 0
depends_on: [clone]
settings:
username:
from_secret: docker_username
password:
from_secret: docker_password
repo: library/nginx-brotli
repo: registry.odit.services/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]
@@ -126,18 +129,19 @@ type: kubernetes
name: build:nightly
steps:
- name: docker release
image: registry.odit.services/library/drone-kaniko
image: plugins/docker
user: 0
depends_on: [clone]
settings:
username:
from_secret: docker_username
password:
from_secret: docker_password
repo: library/nginx-brotli
repo: registry.odit.services/library/nginx-brotli
tags:
- nightly
cache: true
registry: registry.odit.services
mtu: 1000
trigger:
branch:
- main
@@ -153,7 +157,7 @@ name: build:weekly
steps:
- name: bump_prepatch
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:
- apk add git
- git config --global push.default current
@@ -174,19 +178,20 @@ steps:
ssh_key:
from_secret: git_ssh
- name: docker release
image: registry.odit.services/library/drone-kaniko
depends_on: [bump_prepatch]
image: plugins/docker
user: 0
depends_on: [clone]
settings:
username:
from_secret: docker_username
password:
from_secret: docker_password
repo: library/nginx-brotli
repo: registry.odit.services/library/nginx-brotli
tags:
- weekly
- "${DRONE_STAGE_STARTED}"
cache: true
registry: registry.odit.services
mtu: 1000
trigger:
branch:
- main
@@ -195,20 +200,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

View File

@@ -1,5 +1,4 @@
ARG ALPINE_VERSION=3.15
ARG NGINX_VERSION=1.20.2
ARG NGINX_VERSION=1.20.1
ARG NGX_BROTLI_COMMIT=9aec15e2aa6feea2113119ba06460af70ab3ea62
ARG CONFIG="\
--prefix=/etc/nginx \
@@ -65,7 +64,7 @@ RUN \
zlib-dev \
linux-headers \
curl \
# gnupg \
gnupg1 \
libxslt-dev \
gd-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 \
&& 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
@@ -146,6 +145,7 @@ 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,7 +160,6 @@ COPY nginx.vh.default.conf /etc/nginx/conf.d/default.conf
EXPOSE 80 443
STOPSIGNAL SIGQUIT
STOPSIGNAL SIGTERM
ENTRYPOINT ["nginx"]
CMD ["-g", "daemon off;"]
CMD ["nginx", "-g", "daemon off;"]

View File

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