Merge pull request #72 from linuxserver/alpine-tag

Rebase to alpine. Add mariadb-backup.

Author: aptalca

.github/ISSUE_TEMPLATE/issue.bug.md

@@ -4,24 +4,25 @@ on:
   workflow_dispatch:
 
 jobs:
-  external-trigger-master:
+  external-trigger-alpine:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/[email protected]
 
       - name: External Trigger
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/alpine'
         run: |
-          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_MARIADB_MASTER }}" ]; then
-            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_MARIADB_MASTER is set; skipping trigger. ****"
+          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_MARIADB_ALPINE }}" ]; then
+            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_MARIADB_ALPINE is set; skipping trigger. ****"
             exit 0
           fi
-          echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_MARIADB_MASTER\". ****"
+          echo "**** External trigger running off of alpine branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_MARIADB_ALPINE\". ****"
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -sX GET http://mirror.rackspace.com/mariadb/repo/10.4/ubuntu/dists/bionic/main/binary-amd64/Packages |grep -A 7 -m 1 'Package: mariadb-server' | awk -F ': ' '/Version/{print $2;exit}')
+          EXT_RELEASE=$(docker run --rm alpine:3.13 sh -c 'apk update --quiet --repository '"http://dl-cdn.alpinelinux.org/alpine/v3.13/main/"'\
+            && apk info --repository '"http://dl-cdn.alpinelinux.org/alpine/v3.13/main/"' '"mariadb"' | md5sum | cut -c1-8')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"
-            FAILURE_REASON="Can't retrieve external version for mariadb branch master"
+            FAILURE_REASON="Can't retrieve external version for mariadb branch alpine"
             GHA_TRIGGER_URL="https://github.com/linuxserver/docker-mariadb/actions/runs/${{ github.run_id }}"
             curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
               "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}],
@@ -32,7 +33,7 @@ jobs:
           echo "**** External version: ${EXT_RELEASE} ****"
           echo "**** Retrieving last pushed version ****"
           image="linuxserver/mariadb"
-          tag="latest"
+          tag="alpine"
           token=$(curl -sX GET \
             "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fmariadb%3Apull" \
             | jq -r '.token')
@@ -54,7 +55,7 @@ jobs:
           IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
           if [ -z "${IMAGE_VERSION}" ]; then
             echo "**** Can't retrieve last pushed version, exiting ****"
-            FAILURE_REASON="Can't retrieve last pushed version for mariadb tag latest"
+            FAILURE_REASON="Can't retrieve last pushed version for mariadb tag alpine"
             curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
               "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
               "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
@@ -64,13 +65,13 @@ jobs:
           if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
             echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
             exit 0
-          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-mariadb/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-mariadb/job/alpine/lastBuild/api/json | jq -r '.building') == "true" ]; then
             echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
             exit 0
           else
             echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
             response=$(curl -iX POST \
-              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-mariadb/job/master/buildWithParameters?PACKAGE_CHECK=false \
+              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-mariadb/job/alpine/buildWithParameters?PACKAGE_CHECK=false \
               --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
             echo "**** Jenkins job queue url: ${response%$'\r'} ****"
             echo "**** Sleeping 10 seconds until job starts ****"
@@ -85,7 +86,7 @@ jobs:
               --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
               --data-urlencode "Submit=Submit"
             echo "**** Notifying Discord ****"
-            TRIGGER_REASON="A version change was detected for mariadb tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
+            TRIGGER_REASON="A version change was detected for mariadb tag alpine. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
             curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
               "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
               "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}

.github/workflows/external_trigger.yml

@@ -4,25 +4,25 @@ on:
   workflow_dispatch:
 
 jobs:
-  package-trigger-master:
+  package-trigger-alpine:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/[email protected]
 
       - name: Package Trigger
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/alpine'
         run: |
-          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_MARIADB_MASTER }}" ]; then
-            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_MARIADB_MASTER is set; skipping trigger. ****"
+          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_MARIADB_ALPINE }}" ]; then
+            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_MARIADB_ALPINE is set; skipping trigger. ****"
             exit 0
           fi
-          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-mariadb/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-mariadb/job/alpine/lastBuild/api/json | jq -r '.building') == "true" ]; then
             echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
             exit 0
           fi
-          echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_MARIADB_MASTER\". ****"
+          echo "**** Package trigger running off of alpine branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_MARIADB_ALPINE\". ****"
           response=$(curl -iX POST \
-            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-mariadb/job/master/buildWithParameters?PACKAGE_CHECK=true \
+            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-mariadb/job/alpine/buildWithParameters?PACKAGE_CHECK=true \
             --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
           echo "**** Jenkins job queue url: ${response%$'\r'} ****"
           echo "**** Sleeping 10 seconds until job starts ****"

.github/workflows/package_trigger.yml

@@ -1,48 +1,45 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic
+FROM ghcr.io/linuxserver/baseimage-alpine:3.13
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG MARIADB_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="thelamer"
+LABEL maintainer="thelamer,nemchik"
 
 # environment variables
-ARG DEBIAN_FRONTEND="noninteractive"
 ENV MYSQL_DIR="/config"
 ENV DATADIR=$MYSQL_DIR/databases
 
 RUN \
- echo "**** install gnupg ****" && \
- apt-get update && \
- apt-get install -y \
-	gnupg && \
- echo "add mariadb repository ****" && \
- echo "(redundant on armhf platform, but added for consistent dockerfile on all platforms) ****" && \
- apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 && \
- echo "deb http://mirror.rackspace.com/mariadb/repo/10.4/ubuntu bionic main" >> \
-	/etc/apt/sources.list.d/mariadb.list && \
- echo "deb-src http://mirror.rackspace.com/mariadb/repo/10.4/ubuntu bionic main" >> \
-	/etc/apt/sources.list.d/mariadb.list && \
+ echo "**** install build packages ****" && \
+ apk add --no-cache --virtual=build-dependencies \
+	curl && \
+ echo "**** temporarily forcing MARIADB_VERSION ****" && \
+	MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+	&& awk '/^P:mariadb$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
  echo "**** install runtime packages ****" && \
  if [ -z ${MARIADB_VERSION+x} ]; then \
-        MARIADB="mariadb-server"; \
- else \
-        MARIADB="mariadb-server=${MARIADB_VERSION}"; \
+	MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+	&& awk '/^P:mariadb$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
  fi && \
- apt-get update && \
- apt-get install -y \
-	${MARIADB} && \
+ apk add --no-cache \
+	gnupg \
+	mariadb==${MARIADB_VERSION} \
+	mariadb-backup==${MARIADB_VERSION} \
+	mariadb-client==${MARIADB_VERSION} \
+	mariadb-common==${MARIADB_VERSION} \
+	mariadb-server-utils==${MARIADB_VERSION} && \
  echo "**** cleanup ****" && \
+ apk del --purge \
+	build-dependencies && \
  rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/lib/mysql \
-	/var/tmp/* && \
+    /root/.cache \
+    /tmp/* && \
  mkdir -p \
 	/var/lib/mysql
 
-# add local files
+# copy local files
 COPY root/ /
 
 # ports and volumes

Dockerfile

@@ -1,48 +1,45 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.13
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG MARIADB_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="thelamer"
+LABEL maintainer="thelamer,nemchik"
 
 # environment variables
-ARG DEBIAN_FRONTEND="noninteractive"
 ENV MYSQL_DIR="/config"
 ENV DATADIR=$MYSQL_DIR/databases
 
 RUN \
- echo "**** install gnupg ****" && \
- apt-get update && \
- apt-get install -y \
-	gnupg && \
- echo "add mariadb repository ****" && \
- echo "(redundant on armhf platform, but added for consistent dockerfile on all platforms) ****" && \
- apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 && \
- echo "deb http://mirror.rackspace.com/mariadb/repo/10.4/ubuntu bionic main" >> \
-	/etc/apt/sources.list.d/mariadb.list && \
- echo "deb-src http://mirror.rackspace.com/mariadb/repo/10.4/ubuntu bionic main" >> \
-	/etc/apt/sources.list.d/mariadb.list && \
+ echo "**** install build packages ****" && \
+ apk add --no-cache --virtual=build-dependencies \
+	curl && \
+ echo "**** temporarily forcing MARIADB_VERSION ****" && \
+	MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+	&& awk '/^P:mariadb$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
  echo "**** install runtime packages ****" && \
  if [ -z ${MARIADB_VERSION+x} ]; then \
-        MARIADB="mariadb-server"; \
- else \
-        MARIADB="mariadb-server=${MARIADB_VERSION}"; \
+	MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+	&& awk '/^P:mariadb$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
  fi && \
- apt-get update && \
- apt-get install -y \
-	${MARIADB} && \
+ apk add --no-cache \
+	gnupg \
+	mariadb==${MARIADB_VERSION} \
+	mariadb-backup==${MARIADB_VERSION} \
+	mariadb-client==${MARIADB_VERSION} \
+	mariadb-common==${MARIADB_VERSION} \
+	mariadb-server-utils==${MARIADB_VERSION} && \
  echo "**** cleanup ****" && \
+ apk del --purge \
+	build-dependencies && \
  rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/lib/mysql \
-	/var/tmp/* && \
+    /root/.cache \
+    /tmp/* && \
  mkdir -p \
 	/var/lib/mysql
 
-# add local files
+# copy local files
 COPY root/ /
 
 # ports and volumes

Dockerfile.aarch64

@@ -1,43 +1,45 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.13
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG MARIADB_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="thelamer"
+LABEL maintainer="thelamer,nemchik"
 
 # environment variables
-ARG DEBIAN_FRONTEND="noninteractive"
 ENV MYSQL_DIR="/config"
 ENV DATADIR=$MYSQL_DIR/databases
 
 RUN \
- echo "**** install gnupg ****" && \
- apt-get update && \
- apt-get install -y \
-	gnupg && \
- echo "add mariadb repository ****" && \
- echo "(redundant on armhf platform, but added for consistent dockerfile on all platforms) ****" && \
- apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 && \
- echo "deb http://mirror.rackspace.com/mariadb/repo/10.4/ubuntu bionic main" >> \
-	/etc/apt/sources.list.d/mariadb.list && \
- echo "deb-src http://mirror.rackspace.com/mariadb/repo/10.4/ubuntu bionic main" >> \
-	/etc/apt/sources.list.d/mariadb.list && \
+ echo "**** install build packages ****" && \
+ apk add --no-cache --virtual=build-dependencies \
+	curl && \
+ echo "**** temporarily forcing MARIADB_VERSION ****" && \
+	MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+	&& awk '/^P:mariadb$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
  echo "**** install runtime packages ****" && \
- apt-get update && \
- apt-get install -y \
-	mariadb-server && \
+ if [ -z ${MARIADB_VERSION+x} ]; then \
+	MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+	&& awk '/^P:mariadb$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
+ fi && \
+ apk add --no-cache \
+	gnupg \
+	mariadb==${MARIADB_VERSION} \
+	mariadb-backup==${MARIADB_VERSION} \
+	mariadb-client==${MARIADB_VERSION} \
+	mariadb-common==${MARIADB_VERSION} \
+	mariadb-server-utils==${MARIADB_VERSION} && \
  echo "**** cleanup ****" && \
+ apk del --purge \
+	build-dependencies && \
  rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/lib/mysql \
-	/var/tmp/* && \
+    /root/.cache \
+    /tmp/* && \
  mkdir -p \
 	/var/lib/mysql
 
-# add local files
+# copy local files
 COPY root/ /
 
 # ports and volumes