From 24203954e83b9f5e7da2b9535f4ec28936895fc2 Mon Sep 17 00:00:00 2001
From: Henning Bocklage <henning@bocklage.com>
Date: Sat, 6 Jun 2020 00:29:32 +0200
Subject: [PATCH] When a couple of guys who were up to no good

---
 .gitlab-ci.yml | 23 +++++++++++++++++------
 post_push      | 43 -------------------------------------------
 2 files changed, 17 insertions(+), 49 deletions(-)
 delete mode 100644 post_push

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 539d31a..85219e3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,6 @@ services:
 
 stages:
   - build
-  - post
 
 variables:
   IMAGE: registry.gitlab.com/bockiii/deemix-docker
@@ -23,8 +22,20 @@ build:
     - docker push $IMAGE:arm32v7
     - docker build --pull -t $IMAGE:amd64 .
     - docker push $IMAGE:amd64
-
-manifest:
-  stage: post
-  script:
-    - ./post-push
\ No newline at end of file
+    - set -e
+    - IMAGE_OS="linux"
+    - HOST_ARCH=$(uname -m)
+    - HOST_ARCH_ALIAS=$([[ "${HOST_ARCH}" == "x86_64" ]] && echo "amd64" || echo "${HOST_ARCH}")
+    - BUILD_ARCH=$(echo "${DOCKERFILE_PATH}" | cut -d '.' -f 2)
+    - BUILD_ARCH=$([[ "${BUILD_ARCH}" == *\/* ]] && echo "${BUILD_ARCH}" | rev | cut -d '/' -f 1 | rev || echo "${BUILD_ARCH}")
+    - QEMU_USER_STATIC_ARCH=$([[ "${BUILD_ARCH}" == "armhf" ]] && echo "${BUILD_ARCH::-2}" || echo "${BUILD_ARCH}")
+    - PLATFORMS_ARCH=$([[ "${QEMU_USER_STATIC_ARCH}" == "arm" ]] && echo "${IMAGE_OS}/${QEMU_USER_STATIC_ARCH},${IMAGE_OS}/${QEMU_USER_STATIC_ARCH}64,${IMAGE_OS}/${HOST_ARCH_ALIAS}" || echo "${IMAGE_OS}/${QEMU_USER_STATIC_ARCH}")
+    - if [[ "${HOST_ARCH}" == "${QEMU_USER_STATIC_ARCH}"* || "${BUILD_ARCH}" == "Dockerfile"  ]]; then
+        echo "Building ${BUILD_ARCH} image natively; No manifest needed for current arch."
+        exit 0
+      else
+        MANIFEST_TOOL_VERSION=$(curl -s https://api.github.com/repos/estesp/manifest-tool/releases/latest | grep 'tag_name' | cut -d\" -f4)
+        curl -L https://github.com/estesp/manifest-tool/releases/download/$MANIFEST_TOOL_VERSION/manifest-tool-$IMAGE_OS-$HOST_ARCH_ALIAS -o manifest-tool
+        chmod +x manifest-tool
+        ./manifest-tool push from-spec manifest.yaml
+      fi
\ No newline at end of file
diff --git a/post_push b/post_push
deleted file mode 100644
index 9ebdc9b..0000000
--- a/post_push
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-# Autobuild the Image on Docker Hub with advanced options
-# https://docs.docker.com/docker-hub/builds/advanced/
-
-# if the host is not equal to the building system architecture, set the image arch with manifest correctly on docker hub.
-
-set -e
-
-#IMAGE_OS=$(uname | tr '[:upper:]' '[:lower:]')
-IMAGE_OS="linux"
-HOST_ARCH=$(uname -m)
-HOST_ARCH_ALIAS=$([[ "${HOST_ARCH}" == "x86_64" ]] && echo "amd64" || echo "${HOST_ARCH}")
-BUILD_ARCH=$(echo "${DOCKERFILE_PATH}" | cut -d '.' -f 2)
-BUILD_ARCH=$([[ "${BUILD_ARCH}" == *\/* ]] && echo "${BUILD_ARCH}" | rev | cut -d '/' -f 1 | rev || echo "${BUILD_ARCH}")
-QEMU_USER_STATIC_ARCH=$([[ "${BUILD_ARCH}" == "armhf" ]] && echo "${BUILD_ARCH::-2}" || echo "${BUILD_ARCH}")
-PLATFORMS_ARCH=$([[ "${QEMU_USER_STATIC_ARCH}" == "arm" ]] && echo "${IMAGE_OS}/${QEMU_USER_STATIC_ARCH},${IMAGE_OS}/${QEMU_USER_STATIC_ARCH}64,${IMAGE_OS}/${HOST_ARCH_ALIAS}" || echo "${IMAGE_OS}/${QEMU_USER_STATIC_ARCH}")
-
-echo "PLATFORMS-ARCH: ${PLATFORMS_ARCH}"
-
-if [[ "${HOST_ARCH}" == "${QEMU_USER_STATIC_ARCH}"* || "${BUILD_ARCH}" == "Dockerfile"  ]]; then
-    echo "Building ${BUILD_ARCH} image natively; No manifest needed for current arch."
-    exit 0
-else
-    # Manifest
-
-    # docker manifest: https://docs.docker.com/engine/reference/commandline/manifest/
-    echo "docker manifest (not working with autobuild on docker hub)"
-    #docker manifest create "${IMAGE_NAME}" "${IMAGE_NAME}"
-    #docker manifest annotate "${IMAGE_NAME}" "${IMAGE_NAME}" --os "${IMAGE_OS}" --arch "${QEMU_USER_STATIC_ARCH}"
-    #docker manifest push "${IMAGE_NAME}"
-
-    # manifest-tool: https://github.com/estesp/manifest-tool
-    echo "manifest-tool"
-    # prerelease:
-    #MANIFEST_TOOL_VERSION=$(curl -s https://api.github.com/repos/estesp/manifest-tool/tags  | grep 'name.*v[0-9]' | head -n 1 | cut -d '"' -f 4)
-    # release:
-    MANIFEST_TOOL_VERSION=$(curl -s https://api.github.com/repos/estesp/manifest-tool/releases/latest | grep 'tag_name' | cut -d\" -f4)
-    curl -L https://github.com/estesp/manifest-tool/releases/download/$MANIFEST_TOOL_VERSION/manifest-tool-$IMAGE_OS-$HOST_ARCH_ALIAS -o manifest-tool
-    chmod +x manifest-tool
-    #./manifest-tool push from-args --platforms ${PLATFORMS_ARCH} --template ${IMAGE_NAME} --target ${IMAGE_NAME}
-    ./manifest-tool push from-spec manifest.yaml
-fi
\ No newline at end of file