beautify dockerfile, change to latest tag

Author: hydazz

.github/vars.conf

@@ -4,8 +4,9 @@
 # auto-builder.yml
 # ~~~~~~~~~~~~~~~~~~~~~~~
 
-TAGS='edge'
-LATEST='edge'
+TAGS=''
+LATEST=''
+
 BUILD_SCHEDULE=''
 BRANCH='main'
 DOCKERHUB_IMAGE='amp'

.github/workflows/auto-builder.yml

@@ -10,7 +10,7 @@ on:
       - released
 
 jobs:
-  alpine-edge:
+  alpine-latest:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -42,12 +42,11 @@ jobs:
           docker buildx build \
             --platform=linux/amd64,linux/arm64 \
             --output "type=image,push=true" \
-            --build-arg TAG=edge \
+            --build-arg TAG=latest \
             --build-arg BUILD_DATE="$(date +%Y-%m-%d)" \
             --build-arg VERSION=$(curl -sX GET "https://api.github.com/repos/hydazz/docker-amp/releases/latest" | jq -r .tag_name) \
-            --tag vcxpz/amp:latest \
             --tag vcxpz/amp:$(curl -sX GET "https://api.github.com/repos/hydazz/docker-amp/releases/latest" | jq -r .tag_name) \
-            --tag vcxpz/amp:edge \
+            --tag vcxpz/amp:latest \
             --file Dockerfile .
 
       - name: Get New Package Versions From Image
@@ -58,10 +57,10 @@ jobs:
       - name: Commit And Push Changes To Github
         run: |
           git add -A
-          git commit -m "Bot Updating Files" || echo "No Changes"
-          git push || echo "No Changes"
+          git commit -m "Bot Updating Files" || true
+          git push || true
 
-      - name: Sync README With Docker Hub
+      - name: Sync README.md With Docker Hub
         uses: peter-evans/dockerhub-description@v2
         with:
           username: vcxpz

Dockerfile

@@ -9,50 +9,50 @@ LABEL maintainer="hydaz"
 
 # environment settings
 ENV VERSION=${VERSION} \
-    HOME=/home/abc \
-    USERNAME=admin \
-    PASSWORD=password \
-    MODULE=ADS \
-    S6_SERVICES_GRACETIME=60000
+	HOME=/home/abc \
+	USERNAME=admin \
+	PASSWORD=password \
+	MODULE=ADS \
+	S6_SERVICES_GRACETIME=60000
 
-RUN set -x && \
-   echo "**** install build packages ****" && \
-   apk add --no-cache --virtual=build-dependencies \
-     ca-certificates-mono && \
-   echo "**** install runtime packages ****" && \
-   apk add --no-cache --upgrade \
-     curl \
-     git \
-     iputils \
-     procps \
-     socat \
-     openjdk11-jre-headless \
-     tmux \
-     unzip && \
-   echo "**** ensure abc has a shell ****" && \
-   usermod -d /home/abc -m -s /bin/bash abc && \
-   mkdir -p \
-     /app/amp/ \
-     /home/abc && \
-   chown abc:abc /home/abc && \
-   echo "**** download ampinstmgr.zip ****" && \
-   curl --silent -o \
-     /tmp/ampinstmgr.zip -L \
-     "http://cubecoders.com/Downloads/ampinstmgr.zip" && \
-   echo "**** unzip ampinstmgr and make symlinks ****" && \
-   unzip -q \
-     /tmp/ampinstmgr.zip -d \
-     /app/amp/ && \
-   ln -s /app/amp/ampinstmgr /usr/bin/ampinstmgr && \
-   echo "**** download AMPCache-${VERSION//./}.zip ****" && \
-   curl --silent -o \
-     /app/amp/AMPCache-${VERSION//./}.zip -L \
-     "http://cubecoders.com/Downloads/AMP_Latest.zip" && \
-   echo "**** cleanup ****" && \
-   apk del --purge \
-     build-dependencies && \
-   rm -rf \
-     /tmp/*
+RUN \
+	echo "**** install build packages ****" && \
+	apk add --no-cache --virtual=build-dependencies \
+		ca-certificates-mono && \
+	echo "**** install runtime packages ****" && \
+	apk add --no-cache --upgrade \
+		curl \
+		git \
+		iputils \
+		procps \
+		socat \
+		openjdk11-jre-headless \
+		tmux \
+		unzip && \
+	echo "**** ensure abc has a shell ****" && \
+	usermod -d /home/abc -m -s /bin/bash abc && \
+	mkdir -p \
+		/app/amp/ \
+		/home/abc && \
+	chown abc:abc /home/abc && \
+	echo "**** download ampinstmgr.zip ****" && \
+	curl --silent -o \
+		/tmp/ampinstmgr.zip -L \
+		"http://cubecoders.com/Downloads/ampinstmgr.zip" && \
+	echo "**** unzip ampinstmgr and make symlinks ****" && \
+	unzip -q \
+		/tmp/ampinstmgr.zip -d \
+		/app/amp/ && \
+	ln -s /app/amp/ampinstmgr /usr/bin/ampinstmgr && \
+	echo "**** download AMPCache-${VERSION//./}.zip ****" && \
+	curl --silent -o \
+		/app/amp/AMPCache-${VERSION//./}.zip -L \
+		"http://cubecoders.com/Downloads/AMP_Latest.zip" && \
+	echo "**** cleanup ****" && \
+	apk del --purge \
+		build-dependencies && \
+	rm -rf \
+		/tmp/*
 
 # add local files
 COPY root/ /