From 3e765957b2f1a3f94d3dc1e13b99541c7b4066f7 Mon Sep 17 00:00:00 2001 From: Ville Aikas Date: Mon, 24 Jan 2022 18:14:57 -0800 Subject: [PATCH] Create different release for arm with mysql/mysql-server:8.0 Signed-off-by: Ville Aikas --- .github/workflows/release.yaml | 17 +++++++++++++++++ config/trillian/mysql/300-mysql-trillian.yaml | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 87b30e2a2..986cc2620 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -72,6 +72,13 @@ jobs: # Build a big bundle of joy, this also produces SBOMs ko resolve --tags $(basename "${{ github.ref }}" ),latest -BRf ./config --platform=all --image-refs imagerefs > release.yaml + # arm64 uses mysql/mysql-server but it doesn't seem to work correctly + # as is in github actions, because it wants to change the filesystem. + # TODO(vaikas): Find a way to use the same image, for now, hack and + # use different image for amd and arm until I sort it out. + # https://github.com/vaikas/sigstore-scaffolding/issues/28 + sed -e 's@mysql:8.0@mysql/mysql-server:8.0@' /tmp/release.yaml > /tmp/release-arm.yaml + echo "Doing ko resolve for testdata" # Build a big bundle of test joy, this also produces SBOMs ko resolve --tags $(basename "${{ github.ref }}" ),latest -BRf ./testdata --platform=all --image-refs testimagerefs > testrelease.yaml @@ -92,6 +99,16 @@ jobs: asset_name: release.yaml asset_content_type: text/plain + - name: Upload Core ARM Asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GH_REPO_PAT }} + with: + upload_url: ${{ steps.get_release_url.outputs.upload_url }} + asset_path: ./src/github.com/${{ github.repository }}/release-arm.yaml + asset_name: release-arm.yaml + asset_content_type: text/plain + - name: Upload Test Asset uses: actions/upload-release-asset@v1 env: diff --git a/config/trillian/mysql/300-mysql-trillian.yaml b/config/trillian/mysql/300-mysql-trillian.yaml index e25695fdd..ad1deafb3 100644 --- a/config/trillian/mysql/300-mysql-trillian.yaml +++ b/config/trillian/mysql/300-mysql-trillian.yaml @@ -22,7 +22,7 @@ metadata: app: mysql-trillian spec: containers: - - image: mysql/mysql-server:8.0 + - image: mysql:8.0 name: mysql env: - name: MYSQL_ROOT_PASSWORD