Compare commits
1 Commits
3.15.424-0
...
3.15.47-0
Author | SHA1 | Date | |
---|---|---|---|
2c09e5fb8e |
77
.drone.yml
77
.drone.yml
@@ -47,7 +47,7 @@ name: build:latest
|
||||
steps:
|
||||
- name: bump_patch
|
||||
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:
|
||||
- apk add git
|
||||
- git config --global push.default current
|
||||
@@ -56,7 +56,7 @@ steps:
|
||||
- yarn release:patch
|
||||
- git pull
|
||||
- name: push to repo
|
||||
image: registry.odit.services/hub/appleboy/drone-git-push
|
||||
image: appleboy/drone-git-push
|
||||
depends_on: [bump_patch]
|
||||
settings:
|
||||
commit: false
|
||||
@@ -68,18 +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
|
||||
registry: registry.odit.services
|
||||
repo: registry.odit.services/library/nginx-brotli
|
||||
tags:
|
||||
- latest
|
||||
cache: true
|
||||
registry: registry.odit.services
|
||||
mtu: 1000
|
||||
trigger:
|
||||
branch:
|
||||
- main
|
||||
@@ -89,26 +90,27 @@ 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
|
||||
# - name: sign_image
|
||||
# image: registry.odit.services/hub/library/alpine:edge
|
||||
# depends_on: [build_tag]
|
||||
# commands:
|
||||
# - apk add cosign docker
|
||||
# - echo $COSIGN_KEY | sed 's/<br>/\n/g' > cosign.key
|
||||
# - 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}"
|
||||
mtu: 1000
|
||||
- name: sign_image
|
||||
image: registry.odit.services/hub/library/alpine:edge
|
||||
depends_on: [build_tag]
|
||||
commands:
|
||||
- apk add cosign docker
|
||||
- echo $COSIGN_KEY | sed 's/<br>/\n/g' > cosign.key
|
||||
- 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:
|
||||
COSIGN_KEY:
|
||||
from_secret: cosign_key
|
||||
@@ -127,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
|
||||
@@ -154,7 +157,7 @@ name: build:weekly
|
||||
steps:
|
||||
- name: bump_prepatch
|
||||
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:
|
||||
- apk add git
|
||||
- git config --global push.default current
|
||||
@@ -163,7 +166,7 @@ steps:
|
||||
- "yarn release:prepatch"
|
||||
- git pull
|
||||
- name: push to repo
|
||||
image: registry.odit.services/hub/appleboy/drone-git-push
|
||||
image: appleboy/drone-git-push
|
||||
depends_on: [bump_prepatch]
|
||||
settings:
|
||||
commit: false
|
||||
@@ -175,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,4 +199,21 @@ trigger:
|
||||
- cron
|
||||
cron:
|
||||
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
|
||||
|
15
Dockerfile
15
Dockerfile
@@ -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;"]
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "nginx-brotli",
|
||||
"version": "3.15.424-0",
|
||||
"version": "3.15.47-0",
|
||||
"description": "NGINX Base Image feat. brotli",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
Reference in New Issue
Block a user