Merge pull request #266 from tiredofit/4.x

Release 4.0.0

Author: tiredofit

Dockerfile

@@ -5,64 +5,69 @@ FROM docker.io/tiredofit/${DISTRO}:${DISTRO_VARIANT}
 LABEL maintainer="Dave Conroy (github.com/tiredofit)"
 
 ### Set Environment Variables
-ENV INFLUX_VERSION=1.8.0 \
-    INFLUX2_VERSION=2.4.0 \
+ENV INFLUX1_CLIENT_VERSION=1.8.0 \
+    INFLUX2_CLIENT_VERSION=2.7.3 \
     MSODBC_VERSION=18.3.2.1-1 \
     MSSQL_VERSION=18.3.1.1-1 \
-    AWS_CLI_VERSION=1.25.97 \
+    AWS_CLI_VERSION=1.29.78 \
     CONTAINER_ENABLE_MESSAGING=FALSE \
     CONTAINER_ENABLE_MONITORING=TRUE \
-    CONTAINER_PROCESS_RUNAWAY_PROTECTOR=FALSE \
     IMAGE_NAME="tiredofit/db-backup" \
     IMAGE_REPO_URL="https://github.com/tiredofit/docker-db-backup/"
 
 ### Dependencies
 RUN source /assets/functions/00-container && \
     set -ex && \
+    addgroup -S -g 10000 dbbackup && \
+    adduser -S -D -H -u 10000 -G dbbackup -g "Tired of I.T! DB Backup" dbbackup && \
+    \
     package update && \
     package upgrade && \
     package install .db-backup-build-deps \
-               build-base \
-               bzip2-dev \
-               cargo \
-               git \
-               go \
-               libarchive-dev \
-               openssl-dev \
-               libffi-dev \
-               python3-dev \
-               py3-pip \
-               xz-dev \
-               && \
+                    build-base \
+                    bzip2-dev \
+                    cargo \
+                    git \
+                    go \
+                    libarchive-dev \
+                    openssl-dev \
+                    libffi-dev \
+                    python3-dev \
+                    py3-pip \
+                    xz-dev \
+                    && \
     \
     package install .db-backup-run-deps \
-               bzip2 \
-               groff \
-               libarchive \
-               mariadb-client \
-               mariadb-connector-c \
-               mongodb-tools \
-               openssl \
-               pigz \
-               postgresql16 \
-               postgresql16-client \
-               pv \
-               py3-botocore \
-               py3-colorama \
-               py3-cryptography \
-               py3-docutils \
-               py3-jmespath \
-               py3-rsa \
-               py3-setuptools \
-               py3-s3transfer \
-               py3-yaml \
-               python3 \
-               redis \
-               sqlite \
-               xz \
-               zip \
-               zstd \
-               && \
+                    bzip2 \
+                    coreutils \
+                    gpg \
+                    gpg-agent \
+                    groff \
+                    libarchive \
+                    mariadb-client \
+                    mariadb-connector-c \
+                    mongodb-tools \
+                    openssl \
+                    pigz \
+                    postgresql16 \
+                    postgresql16-client \
+                    pv \
+                    py3-botocore \
+                    py3-colorama \
+                    py3-cryptography \
+                    py3-docutils \
+                    py3-jmespath \
+                    py3-rsa \
+                    py3-setuptools \
+                    py3-s3transfer \
+                    py3-yaml \
+                    python3 \
+                    redis \
+                    sqlite \
+                    xz \
+                    zip \
+                    zstd \
+                    && \
     \
     apkArch="$(uname -m)"; \
     case "$apkArch" in \
@@ -72,10 +77,10 @@ RUN source /assets/functions/00-container && \
     esac; \
     \
     if [ $mssql = "true" ] ; then curl -O https://download.microsoft.com/download/3/5/5/355d7943-a338-41a7-858d-53b259ea33f5/msodbcsql18_${MSODBC_VERSION}_${mssql_arch}.apk ; curl -O https://download.microsoft.com/download/3/5/5/355d7943-a338-41a7-858d-53b259ea33f5/mssql-tools18_${MSSQL_VERSION}_${mssql_arch}.apk ; ls -l ; echo y | apk add --allow-untrusted msodbcsql18_${MSODBC_VERSION}_${mssql_arch}.apk mssql-tools18_${MSSQL_VERSION}_${mssql_arch}.apk ; else echo >&2 "Detected non x86_64 or ARM64 build variant, skipping MSSQL installation" ; fi; \
-    if [ $influx2 = "true" ] ; then curl -sSL https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX2_VERSION}-linux-${influx_arch}.tar.gz | tar xvfz - --strip=1 -C /usr/src/ ; chmod +x /usr/src/influx ; mv /usr/src/influx /usr/sbin/ ; else echo >&2 "Unable to build Influx 2 on this system" ; fi ; \
+    if [ $influx2 = "true" ] ; then curl -sSL https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX2_CLIENT_VERSION}-linux-${influx_arch}.tar.gz | tar xvfz - --strip=1 -C /usr/src/ ; chmod +x /usr/src/influx ; mv /usr/src/influx /usr/sbin/ ; else echo >&2 "Unable to build Influx 2 on this system" ; fi ; \
     clone_git_repo https://github.com/aws/aws-cli "${AWS_CLI_VERSION}" && \
     python3 setup.py install --prefix=/usr && \
-    clone_git_repo https://github.com/influxdata/influxdb "${INFLUX_VERSION}" && \
+    clone_git_repo https://github.com/influxdata/influxdb "${INFLUX1_CLIENT_VERSION}" && \
     go build -o /usr/sbin/influxd ./cmd/influxd && \
     strip /usr/sbin/influxd && \
     mkdir -p /usr/src/pbzip2 && \
@@ -106,5 +111,4 @@ RUN source /assets/functions/00-container && \
             /tmp/* \
             /usr/src/*
 
-
 COPY install  /

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 Dave Conroy
+Copyright (c) 2023 Dave Conroy
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal