Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(nx-container): add support for registry option #1084

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
+22 −3
Open

feat(nx-container): add support for registry option #1084

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c771d82
feat(nx-container): add support for registry option
callajd Jul 13, 2024
51334ab
feat(nx-container): use registry option in 'destination' parameter fo…
callajd Jul 13, 2024
6b14dba
feat(nx-container): better description for 'registry' option
callajd Jul 13, 2024
dbf73cc
feat(nx-container): regenerate schema.d.ts using json-schema-to-types…
callajd Jul 13, 2024
a69d144
feat(nx-container): remove unnecessary schema changes from json-schem…
callajd Jul 13, 2024
06f11a3
feat(nx-container): registry:string -> registries: string[]
callajd Jul 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
feat(nx-container): add support for registry option
  • Loading branch information
@callajd
callajd committed Jul 13, 2024
commit c771d821bb2cf19756ebc5c8eec7ea9c66a5d04a
2 changes: 2 additions & 0 deletions plugins/nx-container/src/executors/build/context.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export interface Inputs {
provenance: string;
pull: boolean;
push: boolean;
registry: string;
secretFiles: string[];
secrets: string[];
shmSize: string;
Expand Down Expand Up @@ -89,6 +90,7 @@ export async function getInputs(
provenance: core.getInput('provenance'),
pull: core.getBooleanInput('pull', { fallback: `${options.pull || false}` }),
push: core.getBooleanInput('push', { fallback: `${options.push || false}` }),
registry: core.getInput('registry', { fallback: options['registry'] }),
secretFiles: await getInputList('secret-files', prefix, options['secret-files'], true),
secrets: await getInputList('secrets', prefix, options.secrets, true),
shmSize: core.getInput('shm-size', { prefix, fallback: options['shm-size'] }),
Expand Down
2 changes: 1 addition & 1 deletion plugins/nx-container/src/executors/build/engines/docker/docker.engine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ export class Docker extends EngineAdapter {
args.push('--ssh', ssh);
});
await asyncForEach(inputs.tags, async (tag) => {
args.push('--tag', tag);
args.push('--tag', inputs.registry ? `${inputs.registry}/${tag}` : tag);
});
if (inputs.target) {
args.push('--target', inputs.target);
Expand Down
2 changes: 1 addition & 1 deletion plugins/nx-container/src/executors/build/engines/podman/podman.engine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export class Podman extends EngineAdapter {
args.push('--ssh', ssh);
});
await asyncForEach(inputs.tags, async (tag) => {
args.push('--tag', tag);
args.push('--tag', inputs.registry ? `${inputs.registry}/${tag}` : tag);
});
if (inputs.target) {
args.push('--target', inputs.target);
Expand Down
4 changes: 4 additions & 0 deletions plugins/nx-container/src/executors/build/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,10 @@
"description": "Push is a shorthand for --output=type=registry (default false)",
"default": false
},
"registry": {
"type": "string",
"description": "Set the name of the destination container registry when using push=true"
},
"secrets": {
"type": "array",
"items": {
Expand Down