Release 3.9.10 - See CHANGELOG.md

Add cargo to build dependencies

.github/workflows/main.yml

@@ -8,8 +8,7 @@ on:
 
 jobs:
   build:
-    #uses: tiredofit/github_actions/.github/workflows/default_amd64_armv7_arm64.yml@main
+    uses: tiredofit/github_actions/.github/workflows/default_amd64_armv7_arm64.yml@main
     #uses: tiredofit/github_actions/.github/workflows/default_amd64.yml@main
-    #uses: tiredofit/github_actions/.github/workflows/default_amd64_armv7_arm64.yml@main
-    uses: tiredofit/github_actions/.github/workflows/default_amd64_arm64.yml@main
+    #uses: tiredofit/github_actions/.github/workflows/default_amd64_arm64.yml@main
     secrets: inherit

.github/workflows/manual.yml

@@ -9,8 +9,7 @@ on:
 
 jobs:
   build:
-    #uses: tiredofit/github_actions/.github/workflows/default_amd64_armv7_arm64.yml@main
+    uses: tiredofit/github_actions/.github/workflows/default_amd64_armv7_arm64.yml@main
     #uses: tiredofit/github_actions/.github/workflows/default_amd64.yml@main
-    #uses: tiredofit/github_actions/.github/workflows/default_amd64_armv7_arm64.yml@main
-    uses: tiredofit/github_actions/.github/workflows/default_amd64_arm64.yml@main
+    #uses: tiredofit/github_actions/.github/workflows/default_amd64_arm64.yml@main
     secrets: inherit

CHANGELOG.md

@@ -1,3 +1,21 @@
+## 3.9.10 2023-08-23 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Stop trying to move a non existent checksum file when ENABLE_CHECKSUM=FALSE
+
+
+## 3.9.9 2023-08-21 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Start compiling aws-cli instead of from packages to continue to support arm/v7
+
+
+## 3.9.8 2023-08-20 <ToshY@github>
+
+   ### Changed
+      - Restore armv7 and aarch64 builds
+
+
 ## 3.9.7 2023-07-18 <dave at tiredofit dot ca>
 
    ### Changed

Dockerfile

@@ -8,6 +8,7 @@ LABEL maintainer="Dave Conroy (github.com/tiredofit)"
 ENV INFLUX_VERSION=1.8.0 \
     INFLUX2_VERSION=2.4.0 \
     MSSQL_VERSION=18.0.1.1-1 \
+    AWS_CLI_VERSION=1.25.97 \
     CONTAINER_ENABLE_MESSAGING=FALSE \
     CONTAINER_ENABLE_MONITORING=TRUE \
     CONTAINER_PROCESS_RUNAWAY_PROTECTOR=FALSE \
@@ -22,19 +23,21 @@ RUN source /assets/functions/00-container && \
     package install .db-backup-build-deps \
                build-base \
                bzip2-dev \
+               cargo \
                git \
                go \
                libarchive-dev \
                openssl-dev \
                libffi-dev \
                python3-dev \
+               py3-setuptools \
                py3-pip \
                xz-dev \
                && \
     \
     package install .db-backup-run-deps \
-               aws-cli \
                bzip2 \
+               groff \
                libarchive \
                mariadb-client \
                mariadb-connector-c \
@@ -44,7 +47,15 @@ RUN source /assets/functions/00-container && \
                postgresql15 \
                postgresql15-client \
                pv \
+               py3-botocore \
+               py3-colorama \
                py3-cryptography \
+               py3-docutils \
+               py3-jmespath \
+               py3-rsa \
+               py3-s3transfer \
+               py3-yaml \
+               python3 \
                redis \
                sqlite \
                xz \
@@ -61,6 +72,8 @@ RUN source /assets/functions/00-container && \
     \
     if [ $mssql = "true" ] ; then curl -O https://download.microsoft.com/download/b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486/msodbcsql18_${MSSQL_VERSION}_amd64.apk ; curl -O https://download.microsoft.com/download/b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486/mssql-tools18_${MSSQL_VERSION}_amd64.apk ; echo y | apk add --allow-untrusted msodbcsql18_${MSSQL_VERSION}_amd64.apk mssql-tools18_${MSSQL_VERSION}_amd64.apk ; else echo >&2 "Detected non x86_64 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 ; \
+    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}" && \
     go build -o /usr/sbin/influxd ./cmd/influxd && \
     strip /usr/sbin/influxd && \

install/assets/functions/10-db-backup

@@ -707,7 +707,7 @@ move_dbbackup() {
             "file" | "filesystem" )
                 print_debug "Moving backup to filesystem"
                 mkdir -p "${DB_DUMP_TARGET}"
-                mv "${TEMP_LOCATION}"/*."${checksum_extension}" "${DB_DUMP_TARGET}"/
+                 if var_true "${ENABLE_CHECKSUM}" ; then mv "${TEMP_LOCATION}"/*."${checksum_extension}" "${DB_DUMP_TARGET}"/ ; fi
                 mv "${TEMP_LOCATION}"/"${target}" "${DB_DUMP_TARGET}"/"${target}"
                 move_exit_code=$?
                 if var_true "${CREATE_LATEST_SYMLINK}" ; then