Release 3.3.1 - See CHANGELOG.md

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 3.3.1 2023-05-10 <dave at tiredofit dot ca>
+
+   ### Added
+      - Modernize Dockerfile
+      - Alpine 3.18 base
+
+
 ## 3.3.0 2022-11-23 <dave at tiredofit dot ca>
 
    ### Added

Dockerfile

@@ -1,18 +1,16 @@
-FROM docker.io/tiredofit/alpine:3.17
+FROM docker.io/tiredofit/alpine:3.18
 LABEL maintainer="Dave Conroy (github.com/tiredofit)"
 
-### Environment Variables
 ENV TINC_VERSION=latest \
     CONTAINER_ENABLE_MESSAGING=FALSE \
     IMAGE_NAME="tiredofit/tinc" \
     IMAGE_REPO_URL="https://github.com/tiredofit/docker-tinc/"
 
-### Dependencies Installation
 RUN source /assets/functions/00-container && \
     set -x && \
-    apk update && \
-    apk upgrade && \
-    apk add -t .tinc-build-deps \
+    package update && \
+    package upgrade && \
+    package add .tinc-build-deps \
 				autoconf \
 				build-base \
 				curl \
@@ -33,7 +31,7 @@ RUN source /assets/functions/00-container && \
 				zlib-dev \
 				&& \
 	\
-    apk add -t .tinc-run-deps \
+    package add .tinc-run-deps \
 				ca-certificates \
 				git \
 				inotify-tools \
@@ -46,18 +44,15 @@ RUN source /assets/functions/00-container && \
 				readline \
 				zlib && \
 	\
-	clone_git_repo https://github.com/gsliepen/tinc ${TINC_VERSION} && \
-	meson setup builddir -Dprefix=/usr -Dsysconfdir=/etc -Djumbograms=true -Dtunemu=enabled -Dbuildtype=release && \
-	meson compile -C builddir && \
-	meson install -C builddir && \
-	apk del --no-cache --purge .tinc-build-deps && \
-	mkdir -p /var/log/tinc && \
-	rm -rf /etc/logrotate.d/* && \
-	rm -rf /usr/src/* && \
-	rm -rf /var/cache/apk/*
+    clone_git_repo https://github.com/gsliepen/tinc ${TINC_VERSION} && \
+    meson setup builddir -Dprefix=/usr -Dsysconfdir=/etc -Djumbograms=true -Dtunemu=enabled -Dbuildtype=release && \
+    meson compile -C builddir && \
+    meson install -C builddir && \
+    package remove .tinc-build-deps && \
+    mkdir -p /var/log/tinc && \
+    rm -rf /etc/logrotate.d/* \
+    rm -rf /usr/src/*
 
-### Networking Configuration
 EXPOSE 655/tcp 655/udp
 
-### Files Addition
 COPY install /

README.md

@@ -100,7 +100,7 @@ The following directories are used for configuration and can be mapped for persi
 
 #### Base Images used
 
-This image relies on an [Alpine Linux](https://hub.docker.com/r/tiredofit/alpine) base image that relies on an [init system](https://github.com/just-containers/s6-overlay) for added capabilities. Outgoing SMTP capabilities are handlded via `msmtp`. Individual container performance monitoring is performed by [zabbix-agent](https://zabbix.org). Additional tools include: `bash`,`curl`,`less`,`logrotate`, `nano`,`vim`.
+This image relies on an [Alpine Linux](https://hub.docker.com/r/tiredofit/alpine) base image that relies on an [init system](https://github.com/just-containers/s6-overlay) for added capabilities. Outgoing SMTP capabilities are handlded via `msmtp`. Individual container performance monitoring is performed by [zabbix-agent](https://zabbix.org). Additional tools include: `bash`,`curl`,`less`,`logrotate`, `nano`.
 
 Be sure to view the following repositories to understand all the customizable options: