Skip to content

Commit 9b3dadc

Browse files
HoriodinoHoriodino
committed
update config
Signed-off-by: Horiodino <[email protected]>
1 parent d7d90f8 commit 9b3dadc

2 files changed

Lines changed: 25 additions & 26 deletions

File tree

‎.github/workflows/go-base.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Run Prepare Action
2323
uses: buildsafedev/multiarch-build--action/prepare-action@main
2424
with:
25-
oci_registry_username: ${{ github.actor }}
25+
oci_registry_username: ${{ env.owner}}
2626
oci_registry_password: ${{ secrets.GITHUB_TOKEN }}
2727
image_name: ${{ env.owner }}/${{ env.dev_image }}
2828
ociBlock: go-dev
@@ -36,7 +36,7 @@ jobs:
3636
- name: Run Prepare Action
3737
uses: buildsafedev/multiarch-build--action/prepare-action@main
3838
with:
39-
oci_registry_username: ${{ github.actor }}
39+
oci_registry_username: ${{ env.owner }}
4040
oci_registry_password: ${{ secrets.GITHUB_TOKEN }}
4141
image_name: ${{ env.owner }}/${{ env.runtime_image }}
4242
ociBlock: go-runtime
@@ -57,7 +57,7 @@ jobs:
5757
- name: Run Build Action
5858
uses: buildsafedev/multiarch-build--action/build-action@main
5959
with:
60-
oci_registry_username: ${{ github.actor }}
60+
oci_registry_username: ${{ env.owner }}
6161
oci_registry_password: ${{ secrets.GITHUB_TOKEN }}
6262
ociBlocks: go-dev go-runtime
6363
directory: 'go-server-example'
@@ -74,7 +74,7 @@ jobs:
7474
- name: Run Merge Action
7575
uses: buildsafedev/multiarch-build--action/merge-action@main
7676
with:
77-
oci_registry_username: ${{ github.actor }}
77+
oci_registry_username: ${{ env.owner }}
7878
oci_registry_password: ${{ secrets.GITHUB_TOKEN }}
7979
image_name: ${{ env.REGISTRY }}/${{ env.owner }}/${{ env.dev_image }}
8080
ociBlock: go-dev
@@ -90,7 +90,7 @@ jobs:
9090
- name: Run Merge Action
9191
uses: buildsafedev/multiarch-build--action/merge-action@main
9292
with:
93-
oci_registry_username: ${{ github.actor }}
93+
oci_registry_username: ${{ env.owner }}
9494
oci_registry_password: ${{ secrets.GITHUB_TOKEN }}
9595
image_name: ${{ env.REGISTRY }}/${{ env.owner }}/${{ env.runtime_image }}
9696
ociBlock: go-runtime
@@ -112,7 +112,7 @@ jobs:
112112
uses: docker/login-action@v3
113113
with:
114114
registry: ghcr.io
115-
username: ${{github.actor}}
115+
username: ${{env.owner}}
116116
password: ${{secrets.GITHUB_TOKEN}}
117117

118118

@@ -171,7 +171,7 @@ jobs:
171171
uses: docker/login-action@v3
172172
with:
173173
registry: ghcr.io
174-
username: ${{github.actor}}
174+
username: ${{env.owner}}
175175
password: ${{secrets.GITHUB_TOKEN}}
176176

177177
- name: Build hermetic image amd64
@@ -227,7 +227,7 @@ jobs:
227227
uses: docker/login-action@v3
228228
with:
229229
registry: ghcr.io
230-
username: ${{github.actor}}
230+
username: ${{env.owner}}
231231
password: ${{secrets.GITHUB_TOKEN}}
232232

233233
- name: Docker meta
@@ -289,7 +289,7 @@ jobs:
289289
uses: docker/login-action@v3
290290
with:
291291
registry: ghcr.io
292-
username: ${{github.actor}}
292+
username: ${{env.owner}}
293293
password: ${{secrets.GITHUB_TOKEN}}
294294

295295
- name: Attest-amd64
@@ -348,7 +348,7 @@ jobs:
348348
uses: docker/login-action@v3
349349
with:
350350
registry: ghcr.io
351-
username: ${{github.actor}}
351+
username: ${{env.owner}}
352352
password: ${{secrets.GITHUB_TOKEN}}
353353

354354

‎go-server-example/bsf/flake.nix‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
description = "";
44

55
inputs = {
6+
nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308.url = "github:nixos/nixpkgs/d7570b04936e9b0f5268e0d834dee40368ad3308";
7+
nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191.url = "github:nixos/nixpkgs/2af19cfb6aa40768c4bbefd801a136270e099191";
68
nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7.url = "github:nixos/nixpkgs/1ebb7d7bba2953a4223956cfb5f068b0095f84a7";
79
nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14.url = "github:nixos/nixpkgs/ac5c1886fd9fe49748d7ab80accc4c847481df14";
810
nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4.url = "github:nixos/nixpkgs/7445ccd775d8b892fc56448d17345443a05f7fb4";
9-
nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308.url = "github:nixos/nixpkgs/d7570b04936e9b0f5268e0d834dee40368ad3308";
10-
nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191.url = "github:nixos/nixpkgs/2af19cfb6aa40768c4bbefd801a136270e099191";
1111

1212
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
1313
gomod2nix.url = "github:nix-community/gomod2nix";
@@ -29,23 +29,23 @@
2929

3030

3131
nix2container ,
32+
nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308,
33+
nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191,
3234
nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7,
3335
nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14,
3436
nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4,
35-
nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308,
36-
nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191,
3737
}: let
3838
supportedSystems = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" "aarch64-linux" ];
3939

4040

4141
forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
4242
inherit system;
4343
nix2containerPkgs = nix2container.packages.${system};
44+
nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs = import nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308 { inherit system; };
45+
nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs = import nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191 { inherit system; };
4446
nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs = import nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7 { inherit system; };
4547
nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs = import nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14 { inherit system; };
4648
nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs = import nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4 { inherit system; };
47-
nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs = import nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308 { inherit system; };
48-
nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs = import nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191 { inherit system; };
4949

5050
buildGoApplication = gomod2nix.legacyPackages.${system}.buildGoApplication;
5151
pkgs = import nixpkgs { inherit system; };
@@ -58,11 +58,11 @@
5858
buildGoApplication,
5959

6060

61+
nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs,
62+
nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs,
6163
nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs,
6264
nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs,
6365
nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs,
64-
nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs,
65-
nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs,
6666
... }: {
6767
devShell = pkgs.mkShell {
6868
# The Nix packages provided in the environment
@@ -84,7 +84,7 @@
8484
buildGoApplication,
8585

8686

87-
nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs, nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, ... }: {
87+
nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs, nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, ... }: {
8888
runtime = pkgs.buildEnv {
8989
name = "runtimeenv";
9090
paths = [
@@ -98,7 +98,7 @@
9898
buildGoApplication,
9999

100100

101-
nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs, nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, ... }: {
101+
nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs, nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, ... }: {
102102
development = pkgs.buildEnv {
103103
name = "devenv";
104104
paths = [
@@ -119,12 +119,12 @@
119119

120120

121121

122-
ociImage_go-dev = forEachSupportedSystem ({ pkgs, nix2containerPkgs, system , nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs, nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, ... }: {
122+
ociImage_go-dev = forEachSupportedSystem ({ pkgs, nix2containerPkgs, system , nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs, nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, ... }: {
123123

124124

125125

126126
ociImage_go-dev_base = nix2containerPkgs.nix2container.buildImage {
127-
name = "docker.io/holiodin01/go-base-dev";
127+
name = "ghcr.io/buildsafedev/go-base-dev";
128128
config = {
129129
cmd = [ ];
130130
entrypoint = [ ];
@@ -139,8 +139,7 @@ ociImage_go-dev = forEachSupportedSystem ({ pkgs, nix2containerPkgs, system , n
139139
layers = [
140140
(nix2containerPkgs.nix2container.buildLayer {
141141
copyToRoot = [
142-
inputs.self.runtimeEnvs.${system}.runtime
143-
inputs.self.devEnvs.${system}.development
142+
inputs.self.devEnvs.${system}.development
144143
];
145144
})
146145

@@ -154,12 +153,12 @@ inputs.self.devEnvs.${system}.development
154153

155154
});
156155

157-
ociImage_go-runtime = forEachSupportedSystem ({ pkgs, nix2containerPkgs, system , nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs, nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, ... }: {
156+
ociImage_go-runtime = forEachSupportedSystem ({ pkgs, nix2containerPkgs, system , nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs, nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, ... }: {
158157

159158

160159

161160
ociImage_go-runtime_base = nix2containerPkgs.nix2container.buildImage {
162-
name = "docker.io/holiodin01/go-base-runtime";
161+
name = "ghcr.io/buildsafedev/go-base-runtime";
163162
config = {
164163
cmd = [ ];
165164
entrypoint = [ ];

0 commit comments

Comments
 (0)