Skip to content

Commit

Permalink
feat(build): fluidattacks#1064 sign arm containers
Browse files Browse the repository at this point in the history
- Sign containers as they are deploying now
- Use smaller buildjet machines
- Update container registry references
- Update pipeline builtin to support images

Signed-off-by: Daniel Salazar <podany270895@gmail.com>
  • Loading branch information
dsalaza4 committed Apr 25, 2023
1 parent df62a98 commit 7b7d16d
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
args: sh -c "nix-env -if . && m . /deployContainerImage/makesLatestAmd64"
deployContainerImage_makesLatestArm64:
if: ${{ github.repository == 'fluidattacks/makes' }}
runs-on: buildjet-4vcpu-ubuntu-2204-arm
runs-on: buildjet-2vcpu-ubuntu-2204-arm
permissions:
packages: write
id-token: write
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
args: sh -c "nix-env -if . && m . /deployContainerImage/makesPinnedAmd64"
deployContainerImage_makesPinnedArm64:
if: ${{ github.repository == 'fluidattacks/makes' }}
runs-on: buildjet-4vcpu-ubuntu-2204-arm
runs-on: buildjet-2vcpu-ubuntu-2204-arm
permissions:
packages: write
id-token: write
Expand Down
4 changes: 2 additions & 2 deletions docs/src/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Example:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
- uses: docker://ghcr.io/fluidattacks/makes:23.04
- uses: docker://ghcr.io/fluidattacks/makes/amd64:23.04
name: helloWorld
with:
args: m . /helloWorld 1 2 3
Expand All @@ -96,7 +96,7 @@ Example:
```yaml
# .gitlab-ci.yml
/helloWorld:
image: ghcr.io/fluidattacks/makes:23.04
image: ghcr.io/fluidattacks/makes/amd64:23.04
script:
- m . /helloWorld 1 2 3
```
Expand Down
4 changes: 2 additions & 2 deletions makes.nix
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
};
registry = "ghcr.io";
src = outputs."/container-image";
sign = false;
sign = true;
tag = "fluidattacks/makes/arm64:latest";
};
makesPinnedAmd64 = {
Expand All @@ -66,7 +66,7 @@
};
registry = "ghcr.io";
src = outputs."/container-image";
sign = false;
sign = true;
tag = "fluidattacks/makes/arm64:23.04";
};
};
Expand Down
7 changes: 6 additions & 1 deletion src/evaluator/modules/pipelines/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@
default = {};
type = lib.types.attrsOf lib.types.anything;
};
image = lib.mkOption {
default = "ghcr.io/fluidattacks/makes/amd64:23.04";
type = lib.types.str;
};
output = lib.mkOption {
type = lib.types.str;
};
Expand Down Expand Up @@ -86,13 +90,14 @@
args,
gitDepth,
gitlabExtra,
image,
output,
...
}: {
name = toJobName output args;
value = attrsMerge [
{
image = "ghcr.io/fluidattacks/makes:23.04";
inherit image;
interruptible = true;
needs = [];
script =
Expand Down
4 changes: 2 additions & 2 deletions test/pipelines/.gitlab-ci.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/helloWorld__1__2__3:
image: ghcr.io/fluidattacks/makes:23.04
image: ghcr.io/fluidattacks/makes/amd64:23.04
interruptible: true
needs: []
script:
Expand All @@ -8,7 +8,7 @@
GIT_DEPTH: 1
MAKES_GIT_DEPTH: 1
/lintNix:
image: ghcr.io/fluidattacks/makes:23.04
image: ghcr.io/fluidattacks/makes/amd64:23.04
interruptible: true
needs: []
script:
Expand Down

0 comments on commit 7b7d16d

Please sign in to comment.