diff options
| author | Ellie Huxtable <ellie@atuin.sh> | 2024-11-09 11:17:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-09 11:17:50 -0800 |
| commit | 6ab61e48d0d4e369a9109db326d08469a4bcb789 (patch) | |
| tree | 9598eadd5f4c5326d45d7bfbd1e6ede02b75409e /.github | |
| parent | chore(deps): bump debian (#2426) (diff) | |
| download | atuin-6ab61e48d0d4e369a9109db326d08469a4bcb789.zip | |
fix: disable the actuated mirror on the x86 docker builder (#2443)
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/docker.yaml | 62 |
1 files changed, 28 insertions, 34 deletions
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index d7280932..0b5257a3 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -2,12 +2,11 @@ name: build-docker on: push: - branches: [ main ] + branches: [main] jobs: - publish_x86: - concurrency: + concurrency: group: ${{ github.ref }}-x86 cancel-in-progress: true permissions: @@ -20,9 +19,6 @@ jobs: repository: atuinsh/atuin path: "./" - - name: Setup mirror - uses: self-actuated/hub-mirror@master - - name: Get Repo Owner id: get_repo_owner run: echo "REPO_OWNER=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" > $GITHUB_ENV @@ -55,9 +51,8 @@ jobs: tags: | ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }}-amd64 - publish_aarch64: - concurrency: + concurrency: group: ${{ github.ref }}-aarch64 cancel-in-progress: true permissions: @@ -109,34 +104,33 @@ jobs: runs-on: ubuntu-latest needs: [publish_x86, publish_aarch64] steps: - - uses: actions/checkout@master - with: - repository: atuinsh/atuin - path: "./" - - - name: Get Repo Owner - id: get_repo_owner - run: echo "REPO_OWNER=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" > $GITHUB_ENV + - uses: actions/checkout@master + with: + repository: atuinsh/atuin + path: "./" - - name: Login to container Registry - uses: docker/login-action@v3 - with: - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - registry: ghcr.io + - name: Get Repo Owner + id: get_repo_owner + run: echo "REPO_OWNER=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" > $GITHUB_ENV - - name: Get short sha - id: shortsha - run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + - name: Login to container Registry + uses: docker/login-action@v3 + with: + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + registry: ghcr.io - - name: Create manifest - run: | - docker manifest create ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }} \ - --amend ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }}-amd64 \ - --amend ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }}-aarch64 - docker manifest annotate --arch amd64 --os linux ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }} ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }}-amd64 - docker manifest annotate --arch arm64 --os linux ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }} ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }}-aarch64 - docker manifest inspect ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }} + - name: Get short sha + id: shortsha + run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - docker manifest push ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }} + - name: Create manifest + run: | + docker manifest create ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }} \ + --amend ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }}-amd64 \ + --amend ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }}-aarch64 + docker manifest annotate --arch amd64 --os linux ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }} ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }}-amd64 + docker manifest annotate --arch arm64 --os linux ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }} ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }}-aarch64 + docker manifest inspect ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }} + docker manifest push ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }} |