Release 2.5.0 - See CHANGELOG.md

.github/workflows/main.yml

@@ -1,4 +1,4 @@
-### CI/CD Docker build based on a TOI Base Image
+### Application Level Image CI
 ### Dave Conroy <dave at tiredofit dot ca>
 
 name: 'Build Images'
@@ -21,7 +21,11 @@ jobs:
           DOCKER_IMAGE=${GITHUB_REPOSITORY/docker-/}
           set -x
           if [[ $GITHUB_REF == refs/heads/* ]]; then
+             if [[ $GITHUB_REF == refs/heads/*/* ]] ; then
+               BRANCH="${DOCKER_IMAGE}:$(echo $GITHUB_REF | sed "s|refs/heads/||g" | sed "s|/|-|g")"
+             else
                BRANCH=${GITHUB_REF#refs/heads/}
+             fi
 
             case ${BRANCH} in
               "main" | "master" )
@@ -47,7 +51,6 @@ jobs:
 
           if [[ $GITHUB_REF == refs/tags/* ]]; then
                GITTAG="${DOCKER_IMAGE}:$(echo $GITHUB_REF | sed 's|refs/tags/||g')"
-            echo "GIT TAG: $GITTAG"
           fi
 
           if [ -n "${BRANCHTAG}" ] && [ -n "${GITTAG}" ]; then
@@ -60,13 +63,16 @@ jobs:
           echo ::set-output name=docker_image::${DOCKER_IMAGE}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@master
+        uses: docker/setup-qemu-action@v1
         with:
           platforms: all
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@master
+        uses: docker/setup-buildx-action@v1
+        run: |
+             docker buildx inspect --bootstrap
+
 
       - name: Login to DockerHub
         if: github.event_name != 'pull_request'
@@ -79,20 +85,20 @@ jobs:
         id: Label
         run: |
           if [ -f "Dockerfile" ] ; then
-            sed -i "/FROM .*/a LABEL image_git_repository=\"https://github.com/${GITHUB_REPOSITORY}\"" Dockerfile
+            sed -i "/FROM .*/a LABEL tiredofit.image.git_repository=\"https://github.com/${GITHUB_REPOSITORY}\"" Dockerfile
-            sed -i "/FROM .*/a LABEL image_git_commit=\"${GITHUB_SHA}\"" Dockerfile
+            sed -i "/FROM .*/a LABEL tiredofit.image.git_commit=\"${GITHUB_SHA}\"" Dockerfile
-            sed -i "/FROM .*/a LABEL image_git_committed_by=\"${GITHUB_ACTOR}\"" Dockerfile
+            sed -i "/FROM .*/a LABEL tiredofit.image.git_committed_by=\"${GITHUB_ACTOR}\"" Dockerfile
-            sed -i "/FROM .*/a LABEL image_image_build_date=\"$(date +'%Y-%m-%d %H:%M:%S')\"" Dockerfile
+            sed -i "/FROM .*/a LABEL tiredofit.image.image_build_date=\"$(date +'%Y-%m-%d %H:%M:%S')\"" Dockerfile
             if [ -f "CHANGELOG.md" ] ; then
-              sed -i "/FROM .*/a LABEL image_git_changelog_version=\"$(head -n1 ./CHANGELOG.md | awk '{print $2}')\"" Dockerfile
+              sed -i "/FROM .*/a LABEL tiredofit.image.git_changelog_version=\"$(head -n1 ./CHANGELOG.md | awk '{print $2}')\"" Dockerfile
             fi
 
             if [[ $GITHUB_REF == refs/tags/* ]]; then
-              sed -i "/FROM .*/a LABEL image_git_tag=\"${GITHUB_REF#refs/tags/v}\"" Dockerfile
+              sed -i "/FROM .*/a LABEL tiredofit.image.git_tag=\"${GITHUB_REF#refs/tags/v}\"" Dockerfile
             fi
 
             if [[ $GITHUB_REF == refs/heads/* ]]; then
-              sed -i "/FROM .*/a LABEL image_git_branch=\"${GITHUB_REF#refs/heads/}\"" Dockerfile
+              sed -i "/FROM .*/a LABEL tiredofit.image.git_branch=\"${GITHUB_REF#refs/heads/}\"" Dockerfile
             fi
           fi
 
@@ -102,6 +108,6 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64,linux/arm
+          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
           push: true
           tags: ${{ steps.prep.outputs.tags }}

CHANGELOG.md

@@ -1,3 +1,13 @@
+## 2.5.0 2021-01-25 <dave at tiredofit dot ca>
+
+   ### Added
+      - Multi Platform Build Variants (ARMv7 AMD64 AArch64)
+
+   ### Changed
+      - Alpine 3.13 Base
+      - Compile Pixz as opposed to relying on testing repository
+      - MSSQL Support only available under AMD64. Container exits if any other platform detected when MSSQL set to be backed up.
+
 ## 2.4.0 2020-12-07 <dave at tiredofit dot ca>
 
    ### Added

Dockerfile

@@ -1,4 +1,4 @@
-FROM tiredofit/alpine:edge
+FROM tiredofit/alpine:3.13
 
 ### Set Environment Variables
 ENV MSSQL_VERSION=17.5.2.1-1 \
@@ -9,13 +9,13 @@ ENV MSSQL_VERSION=17.5.2.1-1 \
 
     ### Dependencies
 RUN set -ex && \
-    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
     apk update && \
     apk upgrade && \
     apk add -t .db-backup-build-deps \
                build-base \
                bzip2-dev \
                git \
+               libarchive-dev \
                xz-dev \
                && \
     \
@@ -33,20 +33,28 @@ RUN set -ex && \
                zstd \
                && \
     \
-    apk add --no-cache \
-               pixz@testing \
-               && \
-    \
     cd /usr/src && \
-    curl -O https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_${MSSQL_VERSION}_amd64.apk && \
-    curl -O https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/mssql-tools_${MSSQL_VERSION}_amd64.apk && \
-    echo y | apk add --allow-untrusted msodbcsql17_${MSSQL_VERSION}_amd64.apk mssql-tools_${MSSQL_VERSION}_amd64.apk && \
     \
+    apkArch="$(apk --print-arch)"; \
+    case "$apkArch" in \
+	x86_64) mssql=true ; curl -O https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_${MSSQL_VERSION}_amd64.apk ; curl -O https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/mssql-tools_${MSSQL_VERSION}_amd64.apk ; echo y | apk add --allow-untrusted msodbcsql17_${MSSQL_VERSION}_amd64.apk mssql-tools_${MSSQL_VERSION}_amd64.apk ;; \
+	*) echo >&2 "Detected non x86_64 build variant, skipping MSSQL installation" ;; \
+    esac; \
     mkdir -p /usr/src/pbzip2 && \
-    curl -ssL https://launchpad.net/pbzip2/1.1/1.1.13/+download/pbzip2-1.1.13.tar.gz | tar xvfz - --strip=1 -C /usr/src/pbzip2 && \
+    curl -sSL https://launchpad.net/pbzip2/1.1/1.1.13/+download/pbzip2-1.1.13.tar.gz | tar xvfz - --strip=1 -C /usr/src/pbzip2 && \
     cd /usr/src/pbzip2 && \
     make && \
     make install && \
+    mkdir -p /usr/src/pixz && \
+    curl -sSL https://github.com/vasi/pixz/releases/download/v1.0.7/pixz-1.0.7.tar.xz | tar xvfJ - --strip 1 -C /usr/src/pixz && \
+    cd /usr/src/pixz && \
+    ./configure \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        && \
+     make && \
+     make install && \
      \
 ### Cleanup
     apk del .db-backup-build-deps && \

install/etc/services.available/10-db-backup/run

@@ -42,6 +42,11 @@ case "$dbtype" in
         [[ ( -n "${DB_PASS}" ) || ( -n "${DB_PASS_FILE}" ) ]] && file_env 'DB_PASS'
     ;;
     "mssql" | "MSSQL" | "microsoftsql" | "MICROSOFTSQL")
+        apkArch="$(apk --print-arch)"; \
+	    case "$apkArch" in
+		    x86_64) mssql=true ;;
+		    *) print_error "MSSQL cannot operate on $apkArch processor!" ; exit 1 ;;
+        esac
         dbtype=mssql
         dbport=${DB_PORT:-1433}
     ;;