Compare commits

...

32 Commits

Author SHA1 Message Date
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
61b0d4669d Merge pull request 'Update registry.odit.services/hub/library/node Docker tag to v18.2.0' (#7) from renovate/registry.odit.services-hub-library-node-18.x into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #7
2022-05-24 14:43:36 +00:00
517e2f3dcd Merge branch 'main' into renovate/registry.odit.services-hub-library-node-18.x 2022-05-24 14:41:57 +00:00
73b53975b5 🚀RELEASE 3.15.22 [CI SKIP] 2022-05-24 00:18:37 +00:00
1e1ea14b18 Update registry.odit.services/hub/library/alpine Docker tag to v3.16 2022-05-23 19:17:40 +00:00
7ef9c84dce 🚀RELEASE 3.15.21 [CI SKIP] 2022-05-23 00:18:32 +00:00
71a2cb587b 🚀RELEASE 3.15.21-0 [CI SKIP] 2022-05-22 00:19:21 +00:00
f125a6ddfc 🚀RELEASE 3.15.20 [CI SKIP] 2022-05-21 00:18:41 +00:00
08cb4ded9e 🚀RELEASE 3.15.19 [CI SKIP] 2022-05-20 00:19:03 +00:00
d926328e23 🚀RELEASE 3.15.18 [CI SKIP] 2022-05-19 00:18:20 +00:00
4deb1d53b7 Update registry.odit.services/hub/library/node Docker tag to v18.2.0 2022-05-18 21:48:43 +00:00
3108e46f3d 🚀RELEASE 3.15.17 [CI SKIP] 2022-05-18 00:18:23 +00:00
85f1e99153 🚀RELEASE 3.15.16 [CI SKIP] 2022-05-17 00:18:22 +00:00
93f3da858b 🚀RELEASE 3.15.15 [CI SKIP] 2022-05-16 00:18:39 +00:00
5f41a56149 🚀RELEASE 3.15.15-0 [CI SKIP] 2022-05-15 00:10:14 +00:00
e8aeb52a81 🚀RELEASE 3.15.14 [CI SKIP] 2022-05-14 00:09:17 +00:00
3d8edb129e 🚀RELEASE 3.15.13 [CI SKIP] 2022-05-13 00:09:23 +00:00
f0391ddfcf 🚀RELEASE 3.15.12 [CI SKIP] 2022-05-12 00:09:14 +00:00
73ddccc66f 🚀RELEASE 3.15.11 [CI SKIP] 2022-05-11 00:09:04 +00:00
556e51e87f 🚀RELEASE 3.15.10 [CI SKIP] 2022-05-10 00:09:06 +00:00
e9359ec998 Added basic release script [CI SKIP] 2022-05-09 16:20:54 +02:00
6f86d1f007 🚀RELEASE 3.15.9 [CI SKIP] 2022-05-09 14:18:49 +00:00
8deefdbf38 Merge branch 'main' of git.odit.services:odit/nginx-brotli
All checks were successful
continuous-integration/drone/push Build is passing
2022-05-09 16:18:07 +02:00
f4e1c1de18 Added basic readme [CI SKIP] 2022-05-09 16:18:02 +02:00
90924d7bb3 🚀RELEASE 3.15.8 [CI SKIP] 2022-05-09 00:09:22 +00:00
584f7aa710 🚀RELEASE 3.15.7 [CI SKIP] 2022-05-07 17:56:12 +00:00
6d9eb25330 Merge branch 'main' of git.odit.services:odit/nginx-brotli
All checks were successful
continuous-integration/drone/push Build is passing
2022-05-07 19:55:33 +02:00
940d25b0c2 Typo [CI SKIP] 2022-05-07 19:55:25 +02:00
3ce730d822 🚀RELEASE 3.15.6 [CI SKIP] 2022-05-07 00:09:29 +00:00
7164c54074 🚀RELEASE 3.15.5 [CI SKIP] 2022-05-06 00:09:16 +00:00
4 changed files with 78 additions and 48 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:18.1.0-alpine3.15 image: registry.odit.services/hub/library/node:18.2.0-alpine3.15
commands: commands:
- apk add git - apk add git
- git config --global push.default current - git config --global push.default current
@@ -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
@@ -89,20 +87,19 @@ kind: pipeline
type: kubernetes type: kubernetes
name: build:tags name: build:tags
steps: steps:
- name: build_tag - 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:
- "${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
@@ -157,7 +153,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:18.1.0-alpine3.15 image: registry.odit.services/hub/library/node:18.2.0-alpine3.15
commands: commands:
- apk add git - apk add git
- git config --global push.default current - git config --global push.default current
@@ -167,7 +163,7 @@ steps:
- git pull - git pull
- name: push to repo - name: push to repo
image: appleboy/drone-git-push image: appleboy/drone-git-push
depends_on: [bump_patch] depends_on: [bump_prepatch]
settings: settings:
commit: false commit: false
author_email: bot@odit.services author_email: bot@odit.services
@@ -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

@@ -0,0 +1,33 @@
<p align="center">
<a href="https://odit.services" target="blank"><img src="https://odit.services/img/profile-pic-no_bg.webp" width="200" alt="ODIT Logo" /></a>
</p>
<p align="center">NGINX - Brotli</p>
## Description
A custom alpine based nginx image including Brotli for compression.
## Build
```bash
docker build .
```
## Use
* Docker Image: registry.odit.services/library/nginx-brotli
* Webserver Folder Mount: /usr/share/nginx/html/
* Nginx Config Mount: /etc/nginx/nginx.conf
## Release a new version (triggers ci)
```bash
# pnpm
pnpm i
pnpm release
# yarn
yarn
yarn release
```

View File

@@ -1,6 +1,6 @@
{ {
"name": "nginx-brotli", "name": "nginx-brotli",
"version": "3.15.4", "version": "3.15.22",
"description": "NGINX Base Image feat. brotli", "description": "NGINX Base Image feat. brotli",
"repository": { "repository": {
"type": "git", "type": "git",
@@ -11,6 +11,7 @@
"release-it": "^15.0.0" "release-it": "^15.0.0"
}, },
"scripts": { "scripts": {
"release": "release-it",
"release:patch": "release-it --patch --ci", "release:patch": "release-it --patch --ci",
"release:prepatch": "release-it --prePatch --preRelease --ci" "release:prepatch": "release-it --prePatch --preRelease --ci"
}, },