Skip to content
This repository was archived by the owner on Sep 1, 2025. It is now read-only.

Commit 00b0a1a

Browse files
committed
refac(back): #1351 simplify builtin name
- Rename from deployContainerImage to deployContainer
1 parent 4e2e7ab commit 00b0a1a

5 files changed

Lines changed: 21 additions & 21 deletions

File tree

.github/workflows/prod.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ concurrency:
22
cancel-in-progress: true
33
group: ${{ github.actor }}
44
jobs:
5-
deployContainerImage_makesLatestAmd64:
5+
deployContainer_makesLatestAmd64:
66
if: ${{ github.repository == 'fluidattacks/makes' }}
77
runs-on: ubuntu-latest
88
permissions:
@@ -15,8 +15,8 @@ jobs:
1515
GITHUB_ACTOR: ${{ github.actor }}
1616
GITHUB_TOKEN: ${{ github.token }}
1717
with:
18-
args: sh -c "chown -R root:root /github/workspace && nix-env -if . && m . /deployContainerImage/makesLatestAmd64"
19-
deployContainerImage_makesLatestArm64:
18+
args: sh -c "chown -R root:root /github/workspace && nix-env -if . && m . /deployContainer/makesLatestAmd64"
19+
deployContainer_makesLatestArm64:
2020
if: ${{ github.repository == 'fluidattacks/makes' }}
2121
runs-on: buildjet-2vcpu-ubuntu-2204-arm
2222
permissions:
@@ -29,8 +29,8 @@ jobs:
2929
GITHUB_ACTOR: ${{ github.actor }}
3030
GITHUB_TOKEN: ${{ github.token }}
3131
with:
32-
args: sh -c "chown -R root:root /github/workspace && nix-env -if . && m . /deployContainerImage/makesLatestArm64"
33-
deployContainerImage_makesPinnedAmd64:
32+
args: sh -c "chown -R root:root /github/workspace && nix-env -if . && m . /deployContainer/makesLatestArm64"
33+
deployContainer_makesPinnedAmd64:
3434
if: ${{ github.repository == 'fluidattacks/makes' }}
3535
runs-on: ubuntu-latest
3636
permissions:
@@ -43,8 +43,8 @@ jobs:
4343
GITHUB_ACTOR: ${{ github.actor }}
4444
GITHUB_TOKEN: ${{ github.token }}
4545
with:
46-
args: sh -c "chown -R root:root /github/workspace && nix-env -if . && m . /deployContainerImage/makesPinnedAmd64"
47-
deployContainerImage_makesPinnedArm64:
46+
args: sh -c "chown -R root:root /github/workspace && nix-env -if . && m . /deployContainer/makesPinnedAmd64"
47+
deployContainer_makesPinnedArm64:
4848
if: ${{ github.repository == 'fluidattacks/makes' }}
4949
runs-on: buildjet-2vcpu-ubuntu-2204-arm
5050
permissions:
@@ -57,7 +57,7 @@ jobs:
5757
GITHUB_ACTOR: ${{ github.actor }}
5858
GITHUB_TOKEN: ${{ github.token }}
5959
with:
60-
args: sh -c "chown -R root:root /github/workspace && nix-env -if . && m . /deployContainerImage/makesPinnedArm64"
60+
args: sh -c "chown -R root:root /github/workspace && nix-env -if . && m . /deployContainer/makesPinnedArm64"
6161
releaseGitHub:
6262
if: ${{ github.repository == 'fluidattacks/makes' }}
6363
runs-on: ubuntu-latest

docs/src/api/builtins/deploy.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ Note that positional arguments (`[ "1" "2" "3" ]` in this case)
132132
will be appended to the end of `command`
133133
before sending the job to Batch.
134134

135-
## deployContainerImage
135+
## deployContainer
136136

137137
Deploy a set of container images
138138
in [OCI Format](https://github.com/opencontainers/image-spec)
@@ -143,7 +143,7 @@ please read the `makeContainerImage` reference.
143143

144144
Types:
145145

146-
- deployContainerImage:
146+
- deployContainer:
147147
- images (`attrsOf imageType`): Optional.
148148
Definitions of container images to deploy.
149149
Defaults to `{ }`.
@@ -195,7 +195,7 @@ Example:
195195
};
196196
};
197197

198-
deployContainerImage = {
198+
deployContainer = {
199199
images = {
200200
nginxDockerHub = {
201201
credentials = {
@@ -235,19 +235,19 @@ Example:
235235
=== "Invocation DockerHub"
236236

237237
```bash
238-
DOCKER_HUB_USER=user DOCKER_HUB_PASS=123 m . /deployContainerImage/nginxDockerHub
238+
DOCKER_HUB_USER=user DOCKER_HUB_PASS=123 m . /deployContainer/nginxDockerHub
239239
```
240240

241241
=== "Invocation GitHub"
242242

243243
```bash
244-
GITHUB_ACTOR=user GITHUB_TOKEN=123 m . /deployContainerImage/makesLatest
244+
GITHUB_ACTOR=user GITHUB_TOKEN=123 m . /deployContainer/makesLatest
245245
```
246246

247247
=== "Invocation GitLab"
248248

249249
```bash
250-
CI_REGISTRY_USER=user CI_REGISTRY_PASSWORD=123 m . /deployContainerImage/makesGitLab
250+
CI_REGISTRY_USER=user CI_REGISTRY_PASSWORD=123 m . /deployContainer/makesGitLab
251251
```
252252

253253
## deployTerraform

makes.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
enable = true;
1919
target = "github.com/fluidattacks/makes";
2020
};
21-
deployContainerImage = {
21+
deployContainer = {
2222
images = {
2323
makesLatestAmd64 = {
2424
attempts = 3;

src/args/agnostic.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ let
3030
calculateScorecard = import ./calculate-scorecard/default.nix self;
3131
chunks = import ./chunks/default.nix self;
3232
computeOnAwsBatch = import ./compute-on-aws-batch/default.nix self;
33-
deployContainerImage = import ./deploy-container-image/default.nix self;
33+
deployContainer = import ./deploy-container-image/default.nix self;
3434
deployNomad = import ./deploy-nomad/default.nix self;
3535
deployTerraform = import ./deploy-terraform/default.nix self;
3636
inherit (__nixpkgs__.lib.strings) escapeShellArg;

src/evaluator/modules/deploy-container-image/default.nix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
{ __toModuleOutputs__, deployContainerImage, ... }:
1+
{ __toModuleOutputs__, deployContainer, ... }:
22
{ config, lib, ... }:
33
let
44
makeOutput = name: args: {
5-
name = "/deployContainerImage/${name}";
6-
value = deployContainerImage {
5+
name = "/deployContainer/${name}";
6+
value = deployContainer {
77
inherit (args) attempts;
88
inherit (args) credentials;
99
containerImage = args.src;
@@ -16,7 +16,7 @@ let
1616
};
1717
in {
1818
options = {
19-
deployContainerImage = {
19+
deployContainer = {
2020
images = lib.mkOption {
2121
default = { };
2222
type = lib.types.attrsOf (lib.types.submodule (_: {
@@ -46,6 +46,6 @@ in {
4646
};
4747
};
4848
config = {
49-
outputs = __toModuleOutputs__ makeOutput config.deployContainerImage.images;
49+
outputs = __toModuleOutputs__ makeOutput config.deployContainer.images;
5050
};
5151
}

0 commit comments

Comments
 (0)