Skip to content

Commit

Permalink
add branch name to use in registry cache
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewpearce-digital committed Jul 22, 2024
1 parent 0e30cc8 commit 1e3bf0d
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 8 deletions.
34 changes: 26 additions & 8 deletions .github/workflows/docker_job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ on:
default: ${{ github.ref }}
required: false
type: string
branch_name:
description: 'Branch name'
required: true
type: string

defaults:
run:
Expand Down Expand Up @@ -59,13 +63,27 @@ jobs:
version: v0.15.1
platforms: linux/amd64,linux/arm64

- name: setup cache for ${{ matrix.ecr_repository }}
id: setup_cache
uses: actions/[email protected]
with:
path: ${{ env.BUILD_CACHE }}
key: ${{ inputs.checkout_tag }}-${{ matrix.ecr_repository }}-${{ hashFiles('go.mod', 'go.sum', 'package.json') }}
# - name: setup cache for ${{ matrix.ecr_repository }}
# id: setup_cache
# uses: actions/[email protected]
# with:
# path: ${{ env.BUILD_CACHE }}
# key: ${{ inputs.checkout_tag }}-${{ matrix.ecr_repository }}-${{ hashFiles('go.mod', 'go.sum', 'package.json') }}

- uses: unfor19/install-aws-cli-action@v1
- name: Configure AWS Credentials
uses: aws-actions/[email protected]
with:
aws-region: eu-west-1
role-to-assume: arn:aws:iam::311462405659:role/modernising-lpa-github-actions-ecr-push
role-duration-seconds: 900
role-session-name: GithubActionsECRPushMLPAB
- name: ECR Login
id: login_ecr
uses: aws-actions/[email protected]
with:
mask-password: true
registries: 311462405659

- name: Build ${{ matrix.ecr_repository }} Image
uses: docker/[email protected]
Expand All @@ -75,8 +93,8 @@ jobs:
platforms: linux/amd64
push: false
load: true
cache-to: type=local,dest=${{ env.BUILD_CACHE }}
cache-from: type=local,src=${{ env.BUILD_CACHE }}
cache-from: type=registry,ref=${{ steps.login_ecr.outputs.registry }}/${{ matrix.ecr_repository }}:buildcache-${{ inputs.branch_name }}
cache-to: type=registry,ref=${{ steps.login_ecr.outputs.registry }}/${{ matrix.ecr_repository }}:buildcache-${{ inputs.branch_name }},mode=max
tags: |
${{ matrix.ecr_repository }}:${{ inputs.tag }}
build-args: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/workflow_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ jobs:
]
with:
tag: ${{ needs.create_tags.outputs.version_tag }}
branch_name: ${{ github.head_ref }}

terraform_account_workflow_development:
name: TF Plan Dev Account
Expand Down

0 comments on commit 1e3bf0d

Please sign in to comment.