Compare commits

...

3 Commits

Author SHA1 Message Date
Daniel Wolf 542ce72280
add reuse copyright information
Build Container Image / build_amd64 (push) Successful in 56s Details
Build Container Image / build_i386 (push) Successful in 53s Details
Build Container Image / publish_amd64 (push) Successful in 25s Details
Build Container Image / publish_i386 (push) Successful in 25s Details
Build Container Image / build_arm64 (push) Successful in 3m45s Details
Build Container Image / publish_arm64 (push) Successful in 33s Details
Build Container Image / build_riscv64 (push) Successful in 5m26s Details
Build Container Image / publish_riscv64 (push) Successful in 44s Details
Build Container Image / build_armhf (push) Successful in 7m48s Details
Build Container Image / build_manifest (push) Successful in 6s Details
Build Container Image / publish_armhf (push) Successful in 41s Details
Build Container Image / publish_manifest (push) Successful in 23s Details
2023-10-25 11:04:05 -04:00
Daniel Wolf f4590df081
update to v1.25.3 2023-10-25 10:58:37 -04:00
Daniel Wolf 6872d17d75
update *ignore files 2023-10-25 10:50:07 -04:00
21 changed files with 170 additions and 37 deletions

View File

@ -1,6 +1,11 @@
# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf <nephatrine@gmail.com>
#
# SPDX-License-Identifier: ISC
.git
.gitea
.gitignore
.reuse
LICENSES
LICENSE.md
README.md
docker-compose.yml

View File

@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2023 Daniel Wolf <nephatrine@gmail.com>
#
# SPDX-License-Identifier: ISC
name: Build Container Image
run-name: ${{ gitea.actor }} pushed to ${{ gitea.repository }}:${{ gitea.ref_name }}
on:
@ -15,25 +19,52 @@ jobs:
run: |
export BRANCH=${GITHUB_REF##*/}
export BRANCH=${BRANCH:-master}
docker build --pull -t code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-cached --target builder ${{ gitea.workspace }}
docker build --pull -t code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-amd64-cached --target builder ${{ gitea.workspace }}
docker build --pull -t code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-amd64 ${{ gitea.workspace }}
- name: Docker Login
uses: https://github.com/docker/login-action@v3
if: gitea.ref_name == 'master' || gitea.ref_name == ''
with:
registry: code.nephatrine.net
username: ${{ gitea.actor }}
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Push
run: |
export BRANCH=${GITHUB_REF##*/}
export BRANCH=${BRANCH:-master}
docker push code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-amd64
if: gitea.ref_name == 'master' || gitea.ref_name == ''
run: docker push code.nephatrine.net/nephnet/nginx-ssl:master-amd64
- name: Notify Discord
uses: https://github.com/sarisia/actions-status-discord@v1
if: always()
with:
title: "Container Build (X86_64)"
webhook: ${{ secrets.DISCORD_WEBHOOK_BUILD }}
build_i386:
if: gitea.repository_owner == 'NephNET' && (!contains(gitea.event.head_commit.message, '#noci') || gitea.event_name == 'schedule')
runs-on: nephnet-i386
steps:
- name: Checkout Repository
uses: https://gitea.com/actions/checkout@v3
- name: Docker Build
run: |
export BRANCH=${GITHUB_REF##*/}
export BRANCH=${BRANCH:-master}
docker build --pull -t code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-i386-cached --target builder --platform linux/386 ${{ gitea.workspace }}
docker build --pull -t code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-i386 --platform linux/386 ${{ gitea.workspace }}
- name: Docker Login
uses: https://github.com/docker/login-action@v3
if: gitea.ref_name == 'master' || gitea.ref_name == ''
with:
registry: code.nephatrine.net
username: ${{ gitea.actor }}
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Push
if: gitea.ref_name == 'master' || gitea.ref_name == ''
run: docker push code.nephatrine.net/nephnet/nginx-ssl:master-i386
- name: Notify Discord
uses: https://github.com/sarisia/actions-status-discord@v1
if: always()
with:
title: "Container Build (I686)"
webhook: ${{ secrets.DISCORD_WEBHOOK_BUILD }}
build_arm64:
if: gitea.repository_owner == 'NephNET' && (!contains(gitea.event.head_commit.message, '#noci') || gitea.event_name == 'schedule')
runs-on: nephnet-arm64
@ -44,19 +75,18 @@ jobs:
run: |
export BRANCH=${GITHUB_REF##*/}
export BRANCH=${BRANCH:-master}
docker build --pull -t code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-cached --target builder ${{ gitea.workspace }}
docker build --pull -t code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-arm64v8-cached --target builder ${{ gitea.workspace }}
docker build --pull -t code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-arm64v8 ${{ gitea.workspace }}
- name: Docker Login
uses: https://github.com/docker/login-action@v3
if: gitea.ref_name == 'master' || gitea.ref_name == ''
with:
registry: code.nephatrine.net
username: ${{ gitea.actor }}
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Push
run: |
export BRANCH=${GITHUB_REF##*/}
export BRANCH=${BRANCH:-master}
docker push code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-arm64v8
if: gitea.ref_name == 'master' || gitea.ref_name == ''
run: docker push code.nephatrine.net/nephnet/nginx-ssl:master-arm64v8
- name: Notify Discord
uses: https://github.com/sarisia/actions-status-discord@v1
if: always()
@ -73,19 +103,18 @@ jobs:
run: |
export BRANCH=${GITHUB_REF##*/}
export BRANCH=${BRANCH:-master}
docker build --pull -t code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-cached --target builder ${{ gitea.workspace }}
docker build --pull -t code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-armv7 ${{ gitea.workspace }}
docker build --pull -t code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-armv7-cached --target builder --platform linux/arm/v7 ${{ gitea.workspace }}
docker build --pull -t code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-armv7 --platform linux/arm/v7 ${{ gitea.workspace }}
- name: Docker Login
uses: https://github.com/docker/login-action@v3
if: gitea.ref_name == 'master' || gitea.ref_name == ''
with:
registry: code.nephatrine.net
username: ${{ gitea.actor }}
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Push
run: |
export BRANCH=${GITHUB_REF##*/}
export BRANCH=${BRANCH:-master}
docker push code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-armv7
if: gitea.ref_name == 'master' || gitea.ref_name == ''
run: docker push code.nephatrine.net/nephnet/nginx-ssl:master-armv7
- name: Notify Discord
uses: https://github.com/sarisia/actions-status-discord@v1
if: always()
@ -102,19 +131,18 @@ jobs:
run: |
export BRANCH=${GITHUB_REF##*/}
export BRANCH=${BRANCH:-master}
docker build --pull -t code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-cached --target builder ${{ gitea.workspace }}
docker build --pull -t code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-riscv64-cached --target builder ${{ gitea.workspace }}
docker build --pull -t code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-riscv64 ${{ gitea.workspace }}
- name: Docker Login
uses: https://github.com/docker/login-action@v3
if: gitea.ref_name == 'master' || gitea.ref_name == ''
with:
registry: code.nephatrine.net
username: ${{ gitea.actor }}
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Push
run: |
export BRANCH=${GITHUB_REF##*/}
export BRANCH=${BRANCH:-master}
docker push code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-riscv64
if: gitea.ref_name == 'master' || gitea.ref_name == ''
run: docker push code.nephatrine.net/nephnet/nginx-ssl:master-riscv64
- name: Notify Discord
uses: https://github.com/sarisia/actions-status-discord@v1
if: always()
@ -122,7 +150,8 @@ jobs:
title: "Container Build (RISCV64)"
webhook: ${{ secrets.DISCORD_WEBHOOK_BUILD }}
build_manifest:
needs: [build_amd64, build_arm64, build_armhf, build_riscv64]
if: gitea.ref_name == 'master' || gitea.ref_name == ''
needs: [build_amd64, build_i386, build_arm64, build_armhf, build_riscv64]
runs-on: nephnet
steps:
- name: Docker Login
@ -133,10 +162,8 @@ jobs:
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Manifest
run: |
export BRANCH=${GITHUB_REF##*/}
export BRANCH=${BRANCH:-master}
docker manifest create code.nephatrine.net/nephnet/nginx-ssl:${BRANCH} --amend code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-amd64 --amend code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-arm64v8 --amend code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-armv7 --amend code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}-riscv64
docker manifest push --purge code.nephatrine.net/nephnet/nginx-ssl:${BRANCH}
docker manifest create code.nephatrine.net/nephnet/nginx-ssl:latest --amend code.nephatrine.net/nephnet/nginx-ssl:master-amd64 --amend code.nephatrine.net/nephnet/nginx-ssl:master-i386 --amend code.nephatrine.net/nephnet/nginx-ssl:master-arm64v8 --amend code.nephatrine.net/nephnet/nginx-ssl:master-armv7 --amend code.nephatrine.net/nephnet/nginx-ssl:master-riscv64
docker manifest push --purge code.nephatrine.net/nephnet/nginx-ssl:latest
publish_amd64:
if: gitea.ref_name == 'master' || gitea.ref_name == ''
needs: [build_amd64]
@ -149,8 +176,26 @@ jobs:
password: ${{ secrets.DOCKER_PASS }}
- name: Docker Push
run: |
docker pull code.nephatrine.net/nephnet/nginx-ssl:master-amd64
docker tag code.nephatrine.net/nephnet/nginx-ssl:master-amd64 nephatrine/nginx-ssl:latest-amd64
docker push nephatrine/nginx-ssl:latest-amd64
docker rmi nephatrine/nginx-ssl:latest-amd64
publish_i386:
if: gitea.ref_name == 'master' || gitea.ref_name == ''
needs: [build_i386]
runs-on: nephnet-i386
steps:
- name: Docker Login
uses: https://github.com/docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
- name: Docker Push
run: |
docker pull code.nephatrine.net/nephnet/nginx-ssl:master-i386
docker tag code.nephatrine.net/nephnet/nginx-ssl:master-i386 nephatrine/nginx-ssl:latest-i386
docker push nephatrine/nginx-ssl:latest-i386
docker rmi nephatrine/nginx-ssl:latest-i386
publish_arm64:
if: gitea.ref_name == 'master' || gitea.ref_name == ''
needs: [build_arm64]
@ -163,8 +208,10 @@ jobs:
password: ${{ secrets.DOCKER_PASS }}
- name: Docker Push
run: |
docker pull code.nephatrine.net/nephnet/nginx-ssl:master-arm64v8
docker tag code.nephatrine.net/nephnet/nginx-ssl:master-arm64v8 nephatrine/nginx-ssl:latest-arm64v8
docker push nephatrine/nginx-ssl:latest-arm64v8
docker rmi nephatrine/nginx-ssl:latest-arm64v8
publish_armhf:
if: gitea.ref_name == 'master' || gitea.ref_name == ''
needs: [build_armhf]
@ -177,8 +224,10 @@ jobs:
password: ${{ secrets.DOCKER_PASS }}
- name: Docker Push
run: |
docker pull code.nephatrine.net/nephnet/nginx-ssl:master-armv7
docker tag code.nephatrine.net/nephnet/nginx-ssl:master-armv7 nephatrine/nginx-ssl:latest-armv7
docker push nephatrine/nginx-ssl:latest-armv7
docker rmi nephatrine/nginx-ssl:latest-armv7
publish_riscv64:
if: gitea.ref_name == 'master' || gitea.ref_name == ''
needs: [build_riscv64]
@ -191,8 +240,10 @@ jobs:
password: ${{ secrets.DOCKER_PASS }}
- name: Docker Push
run: |
docker pull code.nephatrine.net/nephnet/nginx-ssl:master-riscv64
docker tag code.nephatrine.net/nephnet/nginx-ssl:master-riscv64 nephatrine/nginx-ssl:latest-riscv64
docker push nephatrine/nginx-ssl:latest-riscv64
docker rmi nephatrine/nginx-ssl:latest-riscv64
publish_manifest:
needs: [publish_amd64, publish_arm64, publish_armhf, publish_riscv64]
runs-on: nephnet
@ -212,11 +263,11 @@ jobs:
password: ${{ secrets.DOCKER_PASS }}
- name: Docker Manifest
run: |
docker manifest create nephatrine/nginx-ssl:1.25.2 --amend nephatrine/nginx-ssl:latest-amd64 --amend nephatrine/nginx-ssl:latest-arm64v8 --amend nephatrine/nginx-ssl:latest-armv7 --amend nephatrine/nginx-ssl:latest-riscv64
docker manifest create nephatrine/nginx-ssl:1.25 --amend nephatrine/nginx-ssl:latest-amd64 --amend nephatrine/nginx-ssl:latest-arm64v8 --amend nephatrine/nginx-ssl:latest-armv7 --amend nephatrine/nginx-ssl:latest-riscv64
docker manifest create nephatrine/nginx-ssl:1 --amend nephatrine/nginx-ssl:latest-amd64 --amend nephatrine/nginx-ssl:latest-arm64v8 --amend nephatrine/nginx-ssl:latest-armv7 --amend nephatrine/nginx-ssl:latest-riscv64
docker manifest create nephatrine/nginx-ssl:latest --amend nephatrine/nginx-ssl:latest-amd64 --amend nephatrine/nginx-ssl:latest-arm64v8 --amend nephatrine/nginx-ssl:latest-armv7 --amend nephatrine/nginx-ssl:latest-riscv64
docker manifest push --purge nephatrine/nginx-ssl:1.25.2
docker manifest create nephatrine/nginx-ssl:1.25.3 --amend nephatrine/nginx-ssl:latest-amd64 --amend nephatrine/nginx-ssl:latest-i386 --amend nephatrine/nginx-ssl:latest-arm64v8 --amend nephatrine/nginx-ssl:latest-armv7 --amend nephatrine/nginx-ssl:latest-riscv64
docker manifest create nephatrine/nginx-ssl:1.25 --amend nephatrine/nginx-ssl:latest-amd64 --amend nephatrine/nginx-ssl:latest-i386 --amend nephatrine/nginx-ssl:latest-arm64v8 --amend nephatrine/nginx-ssl:latest-armv7 --amend nephatrine/nginx-ssl:latest-riscv64
docker manifest create nephatrine/nginx-ssl:1 --amend nephatrine/nginx-ssl:latest-amd64 --amend nephatrine/nginx-ssl:latest-i386 --amend nephatrine/nginx-ssl:latest-arm64v8 --amend nephatrine/nginx-ssl:latest-armv7 --amend nephatrine/nginx-ssl:latest-riscv64
docker manifest create nephatrine/nginx-ssl:latest --amend nephatrine/nginx-ssl:latest-amd64 --amend nephatrine/nginx-ssl:latest-i386 --amend nephatrine/nginx-ssl:latest-arm64v8 --amend nephatrine/nginx-ssl:latest-armv7 --amend nephatrine/nginx-ssl:latest-riscv64
docker manifest push --purge nephatrine/nginx-ssl:1.25.3
docker manifest push --purge nephatrine/nginx-ssl:1.25
docker manifest push --purge nephatrine/nginx-ssl:1
docker manifest push --purge nephatrine/nginx-ssl:latest

3
.gitignore vendored
View File

@ -1,3 +0,0 @@
sign-build.sh
test-build.sh
fix-perms.sh

8
.reuse/dep5 Normal file
View File

@ -0,0 +1,8 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: docker-nginx-ssl
Upstream-Contact: Daniel Wolf <nephatrine@gmail.com>
Source: https://code.nephatrine.net/NephNET/docker-nginx-ssl
Files: override/etc/s6-overlay/*
Copyright: 2022 - 2023 Daniel Wolf <nephatrine@gmail.com>
License: ISC

View File

@ -1,9 +1,13 @@
# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf <nephatrine@gmail.com>
#
# SPDX-License-Identifier: ISC
FROM nephatrine/nxbuilder:alpine AS builder
RUN echo "====== INSTALL LIBRARIES ======" \
&& apk add --no-cache gd-dev geoip-dev libatomic_ops-dev libxslt-dev pcre-dev
ARG NGINX_VERSION=release-1.25.2
ARG NGINX_VERSION=release-1.25.3
RUN git -C /root clone -b "$NGINX_VERSION" --single-branch --depth=1 https://github.com/nginx/nginx.git
RUN echo "====== COMPILE NGINX ======" \

8
LICENSES/ISC.txt Normal file
View File

@ -0,0 +1,8 @@
ISC License:
Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC")
Copyright (c) 1995-2003 by Internet Software Consortium
Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

View File

@ -1,3 +1,9 @@
<!--
SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf <nephatrine@gmail.com>
SPDX-License-Identifier: ISC
-->
[Git](https://code.nephatrine.net/NephNET/docker-nginx-ssl/src/branch/master) |
[Docker](https://hub.docker.com/r/nephatrine/nginx-ssl/) |
[unRAID](https://code.nephatrine.net/NephNET/unraid-containers)
@ -8,7 +14,7 @@ This docker container manages the NGINX application, a lightweight web server
and reverse proxy. It includes certbot/letsencrypt for easily obtaining TLS
certificates if your server is publicly accessible.
The `latest` tag points to version `1.25.2` and this is the only image actively
The `latest` tag points to version `1.25.3` and this is the only image actively
being updated. There are tags for older versions, but these may no longer be
using the latest Alpine version and packages.

View File

@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2023 Daniel Wolf <nephatrine@gmail.com>
#
# SPDX-License-Identifier: ISC
services:
nginx:
build: .

View File

@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf <nephatrine@gmail.com>
#
# SPDX-License-Identifier: ISC
/mnt/config/log/letsencrypt.log {
missingok
notifempty

View File

@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf <nephatrine@gmail.com>
#
# SPDX-License-Identifier: ISC
/mnt/config/log/nginx-access.log /mnt/config/log/nginx-error.log {
missingok
notifempty

View File

@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf <nephatrine@gmail.com>
#
# SPDX-License-Identifier: ISC
daemon off;
error_log /mnt/config/log/nginx-error.log warn;
worker_processes 4;

View File

@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf <nephatrine@gmail.com>
#
# SPDX-License-Identifier: ISC
map $remote_addr $cache_status {
127.0.0.1 $upstream_cache_status;
default "";

View File

@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf <nephatrine@gmail.com>
#
# SPDX-License-Identifier: ISC
gzip on;
gzip_comp_level 4;
gzip_min_length 256;

View File

@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf <nephatrine@gmail.com>
#
# SPDX-License-Identifier: ISC
#NOSSL:listen 80;
#NOSSL:listen [::]:80;
#SSL:listen 443 quic reuseport;

View File

@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf <nephatrine@gmail.com>
#
# SPDX-License-Identifier: ISC
#NOSSL:listen 80;
#NOSSL:listen [::]:80;
#SSL:listen 443 quic;

View File

@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf <nephatrine@gmail.com>
#
# SPDX-License-Identifier: ISC
ssl_protocols TLSv1.2 TLSv1.3;
ssl_prefer_server_ciphers off;
ssl_dhparam /mnt/config/ssl/dhparam.pem;

View File

@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf <nephatrine@gmail.com>
#
# SPDX-License-Identifier: ISC
server {
server_name _;
include /mnt/config/etc/nginx.d/_server_local.inc;

View File

@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf <nephatrine@gmail.com>
#
# SPDX-License-Identifier: ISC
#include /mnt/config/etc/nginx.d/_cache.inc;
#server {

View File

@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf <nephatrine@gmail.com>
#
# SPDX-License-Identifier: ISC
#SSL:server {
#SSL: listen 80 default_server;
#SSL: listen [::]:80 default_server;

View File

@ -1,4 +1,7 @@
#!/command/with-contenv /bin/bash
# SPDX-FileCopyrightText: 2022 - 2023 Daniel Wolf <nephatrine@gmail.com>
#
# SPDX-License-Identifier: ISC
if [[ -z "${SSLDOMAINS}" && ! -d /mnt/config/ssl ]]; then
exit 0

View File

@ -1,4 +1,7 @@
#!/command/with-contenv /bin/bash
# SPDX-FileCopyrightText: 2022 - 2023 Daniel Wolf <nephatrine@gmail.com>
#
# SPDX-License-Identifier: ISC
if [[ -z "${SSLDOMAINS}" && ! -d /mnt/config/ssl ]]; then
exit 0