Skip to content

Commit

Permalink
Merge pull request #382 from crazy-max/dont-set-cwd-prefix
Browse files Browse the repository at this point in the history
don't set cwd:// prefix for local bake files
  • Loading branch information
crazy-max authored Jan 31, 2024
2 parents dbef880 + eda41b7 commit 8e5442c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 35 deletions.
26 changes: 0 additions & 26 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -455,29 +455,3 @@ jobs:
-
name: Print envs
run: env|sort

bake-cwd:
runs-on: ubuntu-latest
steps:
-
name: Checkout
uses: actions/checkout@v4
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
version: latest
-
name: Docker meta
id: docker_meta
uses: ./
-
name: Build
uses: docker/bake-action@v4
with:
files: |
./test/docker-bake.hcl
${{ steps.docker_meta.outputs.bake-file-tags }}
${{ steps.docker_meta.outputs.bake-file-labels }}
targets: |
release
2 changes: 1 addition & 1 deletion dist/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

9 changes: 2 additions & 7 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,22 +94,17 @@ actionsToolkit.run(
setOutput('json', JSON.stringify(jsonOutput));
});

// Specifying local and remote bake files is supported since Buildx 0.12.0.
// Set cwd:// prefix for local bake files to avoid ambiguity with remote
// https://github.com/docker/buildx/pull/1838
const bakeFileCwdPrefix = (await toolkit.buildx.versionSatisfies('>=0.12.0').catch(() => false)) ? 'cwd://' : '';

// Bake files
for (const kind of ['tags', 'labels', 'annotations:' + annotationsLevels]) {
const outputName = kind.split(':')[0];
const bakeFile: string = meta.getBakeFile(kind);
await core.group(`Bake file definition (${outputName})`, async () => {
core.info(fs.readFileSync(bakeFile, 'utf8'));
setOutput(`bake-file-${outputName}`, `${bakeFileCwdPrefix}${bakeFile}`);
setOutput(`bake-file-${outputName}`, bakeFile);
});
}

// Bake file with tags and labels
setOutput(`bake-file`, `${bakeFileCwdPrefix}${meta.getBakeFileTagsLabels()}`);
setOutput(`bake-file`, `${meta.getBakeFileTagsLabels()}`);
}
);

0 comments on commit 8e5442c

Please sign in to comment.