Compare commits

..

1 Commits

Author SHA1 Message Date
a5d8242f0a 🚀RELEASE 3.15.60-0 [CI SKIP] 2022-07-10 00:18:12 +00:00
3 changed files with 57 additions and 37 deletions

View File

@@ -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:19.2.0-alpine3.15 image: registry.odit.services/hub/library/node:18.3.0-alpine3.15
commands: commands:
- apk add git - apk add git
- git config --global push.default current - git config --global push.default current
@@ -56,7 +56,7 @@ steps:
- yarn release:patch - yarn release:patch
- git pull - git pull
- name: push to repo - name: push to repo
image: registry.odit.services/hub/appleboy/drone-git-push image: appleboy/drone-git-push
depends_on: [bump_patch] depends_on: [bump_patch]
settings: settings:
commit: false commit: false
@@ -68,18 +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
registry: registry.odit.services
tags: tags:
- latest - latest
cache: true registry: registry.odit.services
mtu: 1000
trigger: trigger:
branch: branch:
- main - main
@@ -89,26 +90,27 @@ 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
# - name: sign_image mtu: 1000
# image: registry.odit.services/hub/library/alpine:edge - name: sign_image
# depends_on: [build_tag] image: registry.odit.services/hub/library/alpine:edge
# commands: depends_on: [build_tag]
# - apk add cosign docker commands:
# - echo $COSIGN_KEY | sed 's/<br>/\n/g' > cosign.key - apk add cosign docker
# - echo $DOCKER_PASSWORD | docker login registry.odit.services -u $DOCKER_USERNAME --password-stdin - echo $COSIGN_KEY | sed 's/<br>/\n/g' > cosign.key
# - "cosign sign --key cosign.key registry.odit.services/library/nginx-brotli:${DRONE_TAG}" - echo $DOCKER_PASSWORD | docker login registry.odit.services -u $DOCKER_USERNAME --password-stdin
- "cosign sign --key cosign.key registry.odit.services/library/nginx-brotli:${DRONE_TAG}"
environment: environment:
COSIGN_KEY: COSIGN_KEY:
from_secret: cosign_key from_secret: cosign_key
@@ -127,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
@@ -154,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:19.2.0-alpine3.15 image: registry.odit.services/hub/library/node:18.3.0-alpine3.15
commands: commands:
- apk add git - apk add git
- git config --global push.default current - git config --global push.default current
@@ -163,7 +166,7 @@ steps:
- "yarn release:prepatch" - "yarn release:prepatch"
- git pull - git pull
- name: push to repo - name: push to repo
image: registry.odit.services/hub/appleboy/drone-git-push image: appleboy/drone-git-push
depends_on: [bump_prepatch] depends_on: [bump_prepatch]
settings: settings:
commit: false commit: false
@@ -175,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,4 +199,21 @@ trigger:
- cron - cron
cron: cron:
include: include:
- weekly - 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

View File

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

View File

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