Skip to content

Commit 5fbe581

Browse files
committed
chore: layert cache profile fix
1 parent d100822 commit 5fbe581

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/actions/docker/action.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,9 @@ runs:
170170
- name: Build and push Docker image ${{ inputs.image }}
171171
id: docker_build
172172
uses: docker/build-push-action@v6
173-
env: ${{ steps.layer_cache_settings.outputs.env_vars }}
173+
env:
174+
# AWS profile to be used by layer cache; sccache settings are passed via build-args
175+
AWS_PROFILE: ${{ steps.layer_cache_settings.outputs.aws_profile }}
174176
with:
175177
context: .
176178
builder: ${{ steps.buildx.outputs.name }}

.github/actions/s3-layer-cache-settings/action.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,9 @@ outputs:
4545
cache_from:
4646
description: "String with s3-based cache configuration for docker buildx cache-from option"
4747
value: ${{ steps.script.outputs.cache_from }}
48-
env_vars:
49-
description: "Environment variables to set before running docker buildx"
50-
value: |
51-
AWS_PROFILE=docker-layers
52-
AWS_SHARED_CREDENTIALS_FILE=${HOME}/.aws/credentials
48+
aws_profile:
49+
description: "AWS profile to use for s3 cache, to set inside AWS_PROFILE env var"
50+
value: docker-layers
5351

5452
runs:
5553
using: composite

0 commit comments

Comments
 (0)