From 5a8a0415e3ec2fb440dab23c966e66df84570879 Mon Sep 17 00:00:00 2001 From: Hermann Mayer Date: Wed, 9 Oct 2024 13:35:19 +0200 Subject: [PATCH] Dropped version 14, 16, 19. Added the version 20 and 22. Signed-off-by: Hermann Mayer --- .github/workflows/package.yml | 5 +- 16/Dockerfile | 25 ------- 16/Makefile | 65 ----------------- 19/config/avahi.sh | 88 ----------------------- 19/config/dbus.sh | 28 -------- 19/config/haproxy.conf | 44 ------------ 19/config/supervisor/avahi.conf | 14 ---- 19/config/supervisor/dbus.conf | 13 ---- 19/config/supervisor/haproxy.conf | 13 ---- {14 => 20}/Dockerfile | 2 +- {19 => 20}/Makefile | 2 +- {14 => 20}/config/avahi.sh | 0 {14 => 20}/config/dbus.sh | 0 {14 => 20}/config/haproxy.conf | 0 {14 => 20}/config/supervisor/avahi.conf | 0 {14 => 20}/config/supervisor/dbus.conf | 0 {14 => 20}/config/supervisor/haproxy.conf | 0 {19 => 22}/Dockerfile | 2 +- {14 => 22}/Makefile | 2 +- {16 => 22}/config/avahi.sh | 0 {16 => 22}/config/dbus.sh | 0 {16 => 22}/config/haproxy.conf | 0 {16 => 22}/config/supervisor/avahi.conf | 0 {16 => 22}/config/supervisor/dbus.conf | 0 {16 => 22}/config/supervisor/haproxy.conf | 0 latest | 2 +- 26 files changed, 7 insertions(+), 298 deletions(-) delete mode 100644 16/Dockerfile delete mode 100644 16/Makefile delete mode 100755 19/config/avahi.sh delete mode 100755 19/config/dbus.sh delete mode 100644 19/config/haproxy.conf delete mode 100644 19/config/supervisor/avahi.conf delete mode 100644 19/config/supervisor/dbus.conf delete mode 100644 19/config/supervisor/haproxy.conf rename {14 => 20}/Dockerfile (98%) rename {19 => 20}/Makefile (98%) rename {14 => 20}/config/avahi.sh (100%) rename {14 => 20}/config/dbus.sh (100%) rename {14 => 20}/config/haproxy.conf (100%) rename {14 => 20}/config/supervisor/avahi.conf (100%) rename {14 => 20}/config/supervisor/dbus.conf (100%) rename {14 => 20}/config/supervisor/haproxy.conf (100%) rename {19 => 22}/Dockerfile (98%) rename {14 => 22}/Makefile (98%) rename {16 => 22}/config/avahi.sh (100%) rename {16 => 22}/config/dbus.sh (100%) rename {16 => 22}/config/haproxy.conf (100%) rename {16 => 22}/config/supervisor/avahi.conf (100%) rename {16 => 22}/config/supervisor/dbus.conf (100%) rename {16 => 22}/config/supervisor/haproxy.conf (100%) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 24fc22c..ecccbf2 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -20,10 +20,9 @@ jobs: matrix: version: - latest - - 19 + - 22 + - 20 - 18 - - 16 - - 14 steps: - name: Prepare the virtual environment uses: hausgold/actions/ci@master diff --git a/16/Dockerfile b/16/Dockerfile deleted file mode 100644 index 5ece5f1..0000000 --- a/16/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM node:16 -LABEL org.opencontainers.image.authors="containers@hausgold.de" - -# You can change this environment variable on run's with -e -ENV MDNS_HOSTNAME=node.local -ENV NODE_OPTIONS="--max_old_space_size=8192" - -# Install system packages -RUN apt-get update -yqqq && \ - apt-get install -y \ - dbus avahi-daemon avahi-utils libnss-mdns haproxy supervisor - -# Copy custom scripts -COPY config/*.sh /usr/local/bin/ -RUN chmod +x /usr/local/bin/* - -# Configure haproxy -COPY config/haproxy.conf /etc/haproxy/haproxy.cfg - -# Configure supervisord -COPY config/supervisor/* /etc/supervisor/conf.d/ -RUN mkdir -p /var/log/supervisor - -# Define the command to run per default -CMD ["/usr/bin/supervisord", "-nc", "/etc/supervisor/supervisord.conf"] diff --git a/16/Makefile b/16/Makefile deleted file mode 100644 index 8c80867..0000000 --- a/16/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -MAKEFLAGS += --warn-undefined-variables -SHELL := bash -.SHELLFLAGS := -eu -o pipefail -c -.DEFAULT_GOAL := all -.DELETE_ON_ERROR: -.SUFFIXES: -.PHONY: - -# Environment switches -REGISTRY ?= -CANONICAL_NAME ?= node -IMAGE_NAME ?= hausgold/$(CANONICAL_NAME) -IMAGE_REF ?= 16 -IMAGE_URI := $(IMAGE_NAME):$(IMAGE_REF) -TEST_CONTAINER_NAME ?= $(CANONICAL_NAME)-test - -# Host binaries -CURL ?= curl -DOCKER ?= docker -EXIT ?= exit -GREP ?= grep -SLEEP ?= sleep -TEST ?= test -TIME ?= time - -# Define a retry helper -define retry - if eval "$(1)"; then exit 0; fi; \ - for i in 1; do sleep 10s; echo "Retrying $$i..."; \ - if eval "$(1)"; then exit 0; fi; \ - done; \ - exit 1 -endef - -all: - # mDNS enabled official/node - # - # build Build a development snapshot of the image - # test Test the built Docker image - # publish Push the new Docker image to the registry - # - # shell You can start an individual session of the image for tests - # clean Clean the current development snapshot - -build: clean - # Build the Docker image - @$(TIME) $(DOCKER) build --no-cache -t "$(IMAGE_NAME):dev" . - -test: - # Test the built Docker image - # - # Not yet implemented. - -publish: - # Push the new Docker image to the registry - @$(DOCKER) tag "$(IMAGE_NAME):dev" "$(IMAGE_URI)" - @$(call retry,$(TIME) $(SHELL) -c '$(DOCKER) push $(IMAGE_URI)') - -shell: - # Start an individual test session of the image - @$(DOCKER) run --rm -it "$(IMAGE_NAME):dev" bash - -clean: - # Clean the current development snapshot - @$(DOCKER) rmi --force "$(IMAGE_NAME):dev" || true diff --git a/19/config/avahi.sh b/19/config/avahi.sh deleted file mode 100755 index e6099a4..0000000 --- a/19/config/avahi.sh +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -NSS_MDNS=$(dpkg -s libnss-mdns | grep Version: \ - | cut -d: -f2 | cut -d- -f1 | tr -d ' ') - -if [ "${NSS_MDNS}" != '0.10' ]; then - # After nss-mdns >0.10 we need to reconfigure the allowed hosts to support - # multiple sub-domain resolution - cat > /etc/mdns.allow < "/etc/supervisor/conf.d/${CNAME}.conf" </etc/dbus-1/system.d/no-systemd.conf < -# -# 1 -# /bin/true -# -# EOF - -# Start dbus -exec /usr/bin/dbus-daemon --system --nofork diff --git a/19/config/haproxy.conf b/19/config/haproxy.conf deleted file mode 100644 index 9e9d3ca..0000000 --- a/19/config/haproxy.conf +++ /dev/null @@ -1,44 +0,0 @@ -global - log /dev/log local0 - log /dev/log local1 notice - chroot /var/lib/haproxy - stats socket /run/haproxy/admin.sock mode 660 level admin - stats timeout 30s - user haproxy - group haproxy - # daemon - - # Default SSL material locations - ca-base /etc/ssl/certs - crt-base /etc/ssl/private - - # Default ciphers to use on SSL-enabled listening sockets. - # For more information, see ciphers(1SSL). This list is from: - # https://hynek.me/articles/hardening-your-web-servers-ssl-ciphers/ - ssl-default-bind-ciphers ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:!aNULL:!MD5:!DSS - ssl-default-bind-options no-sslv3 - -defaults - log global - mode http - option httplog - option dontlognull - timeout connect 5000 - timeout client 300000 - timeout server 300000 - errorfile 400 /etc/haproxy/errors/400.http - errorfile 403 /etc/haproxy/errors/403.http - errorfile 408 /etc/haproxy/errors/408.http - errorfile 500 /etc/haproxy/errors/500.http - errorfile 502 /etc/haproxy/errors/502.http - errorfile 503 /etc/haproxy/errors/503.http - errorfile 504 /etc/haproxy/errors/504.http - -frontend http-in - bind *:80 - option forwardfor - option http-server-close - use_backend rest - -backend rest - server localhost 127.0.0.1:3000 diff --git a/19/config/supervisor/avahi.conf b/19/config/supervisor/avahi.conf deleted file mode 100644 index 495015f..0000000 --- a/19/config/supervisor/avahi.conf +++ /dev/null @@ -1,14 +0,0 @@ -[program:avahi] -priority=10 -startretries=20 -directory=/tmp -command=/usr/local/bin/avahi.sh -user=root -autostart=true -autorestart=true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 -stopsignal=KILL -stopwaitsecs=1 diff --git a/19/config/supervisor/dbus.conf b/19/config/supervisor/dbus.conf deleted file mode 100644 index 7bce043..0000000 --- a/19/config/supervisor/dbus.conf +++ /dev/null @@ -1,13 +0,0 @@ -[program:dbus] -priority=0 -directory=/tmp -command=/usr/local/bin/dbus.sh -user=root -autostart=true -autorestart=true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 -stopsignal=KILL -stopwaitsecs=1 diff --git a/19/config/supervisor/haproxy.conf b/19/config/supervisor/haproxy.conf deleted file mode 100644 index cac50ab..0000000 --- a/19/config/supervisor/haproxy.conf +++ /dev/null @@ -1,13 +0,0 @@ -[program:haproxy] -priority=10 -directory=/tmp -command=/bin/sh -c "mkdir -p /run/haproxy/ && exec /usr/sbin/haproxy -f /etc/haproxy/haproxy.cfg" -user=root -autostart=true -autorestart=true -# stdout_logfile=/dev/stdout -# stdout_logfile_maxbytes=0 -# stderr_logfile=/dev/stderr -# stderr_logfile_maxbytes=0 -stopsignal=KILL -stopwaitsecs=1 diff --git a/14/Dockerfile b/20/Dockerfile similarity index 98% rename from 14/Dockerfile rename to 20/Dockerfile index a1b31af..d25be3f 100644 --- a/14/Dockerfile +++ b/20/Dockerfile @@ -1,4 +1,4 @@ -FROM node:14 +FROM node:20 LABEL org.opencontainers.image.authors="containers@hausgold.de" # You can change this environment variable on run's with -e diff --git a/19/Makefile b/20/Makefile similarity index 98% rename from 19/Makefile rename to 20/Makefile index 6052b95..d59c429 100644 --- a/19/Makefile +++ b/20/Makefile @@ -10,7 +10,7 @@ SHELL := bash REGISTRY ?= CANONICAL_NAME ?= node IMAGE_NAME ?= hausgold/$(CANONICAL_NAME) -IMAGE_REF ?= 19 +IMAGE_REF ?= 20 IMAGE_URI := $(IMAGE_NAME):$(IMAGE_REF) TEST_CONTAINER_NAME ?= $(CANONICAL_NAME)-test diff --git a/14/config/avahi.sh b/20/config/avahi.sh similarity index 100% rename from 14/config/avahi.sh rename to 20/config/avahi.sh diff --git a/14/config/dbus.sh b/20/config/dbus.sh similarity index 100% rename from 14/config/dbus.sh rename to 20/config/dbus.sh diff --git a/14/config/haproxy.conf b/20/config/haproxy.conf similarity index 100% rename from 14/config/haproxy.conf rename to 20/config/haproxy.conf diff --git a/14/config/supervisor/avahi.conf b/20/config/supervisor/avahi.conf similarity index 100% rename from 14/config/supervisor/avahi.conf rename to 20/config/supervisor/avahi.conf diff --git a/14/config/supervisor/dbus.conf b/20/config/supervisor/dbus.conf similarity index 100% rename from 14/config/supervisor/dbus.conf rename to 20/config/supervisor/dbus.conf diff --git a/14/config/supervisor/haproxy.conf b/20/config/supervisor/haproxy.conf similarity index 100% rename from 14/config/supervisor/haproxy.conf rename to 20/config/supervisor/haproxy.conf diff --git a/19/Dockerfile b/22/Dockerfile similarity index 98% rename from 19/Dockerfile rename to 22/Dockerfile index cb4231d..ffefe05 100644 --- a/19/Dockerfile +++ b/22/Dockerfile @@ -1,4 +1,4 @@ -FROM node:19 +FROM node:22 LABEL org.opencontainers.image.authors="containers@hausgold.de" # You can change this environment variable on run's with -e diff --git a/14/Makefile b/22/Makefile similarity index 98% rename from 14/Makefile rename to 22/Makefile index 2f815be..61c984c 100644 --- a/14/Makefile +++ b/22/Makefile @@ -10,7 +10,7 @@ SHELL := bash REGISTRY ?= CANONICAL_NAME ?= node IMAGE_NAME ?= hausgold/$(CANONICAL_NAME) -IMAGE_REF ?= 14 +IMAGE_REF ?= 22 IMAGE_URI := $(IMAGE_NAME):$(IMAGE_REF) TEST_CONTAINER_NAME ?= $(CANONICAL_NAME)-test diff --git a/16/config/avahi.sh b/22/config/avahi.sh similarity index 100% rename from 16/config/avahi.sh rename to 22/config/avahi.sh diff --git a/16/config/dbus.sh b/22/config/dbus.sh similarity index 100% rename from 16/config/dbus.sh rename to 22/config/dbus.sh diff --git a/16/config/haproxy.conf b/22/config/haproxy.conf similarity index 100% rename from 16/config/haproxy.conf rename to 22/config/haproxy.conf diff --git a/16/config/supervisor/avahi.conf b/22/config/supervisor/avahi.conf similarity index 100% rename from 16/config/supervisor/avahi.conf rename to 22/config/supervisor/avahi.conf diff --git a/16/config/supervisor/dbus.conf b/22/config/supervisor/dbus.conf similarity index 100% rename from 16/config/supervisor/dbus.conf rename to 22/config/supervisor/dbus.conf diff --git a/16/config/supervisor/haproxy.conf b/22/config/supervisor/haproxy.conf similarity index 100% rename from 16/config/supervisor/haproxy.conf rename to 22/config/supervisor/haproxy.conf diff --git a/latest b/latest index dec2bf5..8fdd954 120000 --- a/latest +++ b/latest @@ -1 +1 @@ -19 \ No newline at end of file +22 \ No newline at end of file