Fix missed merge conflict (#274)

* tag with :beta

* Adding more tags

* Fix missed merge conflict

Author: hardillb

.docker/Dockerfile.alpine

@@ -1,9 +1,4 @@
-<<<<<<< HEAD
-ARG ARCH=amd64
-ARG NODE_VERSION=14
-=======
 ARG NODE_VERSION=12
->>>>>>> aa66343d764cc4f200ec7fbef0f01afeb1d82d5c
 ARG OS=alpine
 
 #### Stage BASE ########################################################################################################

.github/workflows/main.yml

@@ -87,10 +87,18 @@ jobs:
             else
               PUSH="false"
             fi
+
             VERSION=${TRAVIS_TAG}
             TAGS=$(echo $TAGS | sed 's!${{ env.DEFAULT_IMAGE}}!${{ env.DEV_IMAGE }}!')
             if [ "${{ matrix.node }}" == "${{ env.LATEST_NODE }}" ] && [ "${{ matrix.suffix}}" == "" ]; then
               TAGS="$TAGS,$IMAGE:$VERSION"
+              if [ "$TRAVIS_TAG" == *"beta"*  ]; then
+                TAGS="$TAGS,$IMAGE:beta"
+              # elsif [ "$TRAVIS_TAG" == *"dev"* ]; then 
+              #   TAGS="$TAGS,$IMAGE:dev"
+              # elsif [ "$TRAVIS_TAG" == *"test"* ]; then 
+              #   TAGS="$TAGS,$IMAGE:test"
+              fi
             fi
           fi