rework for arm64

binhex · Sep 23, 2023 · bc27b92 · bc27b92
1 parent 7971f27
commit bc27b92
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 17 deletions.
diff --git a/.github/workflows/workflow-docker-manual.yml b/.github/workflows/workflow-docker-manual.yml
@@ -89,7 +89,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ github.repository }}:${{ github.event.inputs.tags }}, quay.io/${{ github.repository }}:${{ github.event.inputs.tags }}, ghcr.io/${{ github.repository }}:${{ github.event.inputs.tags }}, registry.gitlab.com/${{ github.repository }}:${{ github.event.inputs.tags }}
           build-args: |

diff --git a/.github/workflows/workflow-docker-release.yml b/.github/workflows/workflow-docker-release.yml
@@ -102,7 +102,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ github.repository }}:latest, ${{ github.repository }}:${{ steps.identify_github_release_tag_name.outputs.tag }}, quay.io/${{ github.repository }}:latest, quay.io/${{ github.repository }}:${{ steps.identify_github_release_tag_name.outputs.tag }}, ghcr.io/${{ github.repository }}:latest, ghcr.io/${{ github.repository }}:${{ steps.identify_github_release_tag_name.outputs.tag }}, registry.gitlab.com/${{ github.repository }}:latest, registry.gitlab.com/${{ github.repository }}:${{ steps.identify_github_release_tag_name.outputs.tag }}
           build-args: |

diff --git a/build/root/install.sh b/build/root/install.sh
@@ -19,11 +19,6 @@ if [[ -z "${TARGETARCH}" ]]; then
 	exit 1
 fi
 
-if [[ -z "${RELEASETAG}" ]]; then
-	echo "[warn] Release tag name from build arg is empty, exiting script..."
-	exit 1
-fi
-
 # build scripts
 ####
 
@@ -69,16 +64,6 @@ github.sh --install-path /usr/bin --github-owner sorenisanerd --github-repo gott
 # get json for latest 'release'
 release_json=$(rcurl.sh -s 'https://launchermeta.mojang.com/mc/game/version_manifest_v2.json' |  jq '[.versions[] | select(.type=="release")][0]')
 
-# identify minecraft version
-id=$(echo "${release_json}" | jq -r .id)
-echo "[info] Minecraft Java version is '${id}'"
-
-# check release tag name matches version from json
-if [[ "${RELEASETAG}" != "${id}" ]]; then
-	echo "[warn] Release tag name from build arg '${RELEASETAG}' does not match id '${id}' from json, exiting script..."
-	exit 1
-fi
-
 # identify minecraft download url json
 url_json=$(echo "${release_json}" | jq -r .url)
 echo "[info] Minecraft Java JSON URL is '${url_json}'"