Skip to content

Commit 736f870

Browse files
PierreJeanjacquotPierreJeanjacquot
committed
fix(sconify)!: move usernames to secrets
1 parent 64773d4 commit 736f870

File tree

2 files changed

+28
-29
lines changed

2 files changed

+28
-29
lines changed

‎.github/workflows/sconify.yml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ on:
77
description: "Docker registry of docker image to sconify"
88
default: "docker.io"
99
type: string
10-
docker-username:
11-
description: "Docker registry username"
12-
type: string
13-
required: true
1410
image-name:
1511
description: "Name of docker image to sconify"
1612
type: string
@@ -19,10 +15,6 @@ on:
1915
description: "Tag of docker image to sconify"
2016
type: string
2117
required: true
22-
scontain-username:
23-
description: "Scontain registry username"
24-
type: string
25-
required: true
2618
sconify-version:
2719
description: "Version of the sconify image to use"
2820
type: string
@@ -72,9 +64,15 @@ on:
7264
type: string
7365
default: "ubuntu-latest"
7466
secrets:
67+
docker-username:
68+
description: "Docker registry username"
69+
required: true
7570
docker-password:
7671
description: "Docker Registry Password or Token"
7772
required: true
73+
scontain-username:
74+
description: "Scontain registry username"
75+
required: true
7876
scontain-password:
7977
description: "Scontain Registry Password or Token"
8078
required: true
@@ -161,14 +159,14 @@ jobs:
161159
uses: docker/login-action@v3
162160
with:
163161
registry: ${{ inputs.docker-registry }}
164-
username: ${{ inputs.docker-username }}
162+
username: ${{ secrets.docker-username }}
165163
password: ${{ secrets.docker-password }}
166164

167165
- name: Login to Scontain Docker Registry
168166
uses: docker/login-action@v3
169167
with:
170168
registry: "registry.scontain.com"
171-
username: ${{ inputs.scontain-username }}
169+
username: ${{ secrets.scontain-username }}
172170
password: ${{ secrets.scontain-password }}
173171

174172
- name: Pull Image to Sconify

‎sconify/README.md‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,22 @@ The workflow performs the following actions:
2222

2323
## Workflow Inputs 🛠️
2424

25-
| **Input** | **Description** | **Required** | **Default** |
26-
| --------------------- | -------------------------------------------------------------------------------------------------------- | ------------ | -------------------------------- |
27-
| **docker-registry** | Docker registry of docker image to sconify | No | docker.io |
28-
| **docker-username** | Docker registry username | Yes | - |
29-
| **image-name** | Name of docker image to sconify | Yes | - |
30-
| **image-tag** | Tag of docker image to sconify | Yes | - |
31-
| **scontain-username** | Scontain registry username | Yes | - |
32-
| **sconify-version** | Version of the sconify image to use | Yes | - |
33-
| **binary** | [SCONE] Path of the binary to use | Yes | - |
34-
| **command** | [SCONE] Command to execute | No | ENTRYPOINT + CMD of native image |
35-
| **binary-fs** | [SCONE] Embed the file system into the binary via Scone binary file system | No | false |
36-
| **fs-dir** | [SCONE] Path of directories to add to the binary file system (use multiline to add multiple directories) | No | - |
37-
| **fs-file** | [SCONE] Path of files to add to the binary file system (use multiline to add multiple files) | No | - |
38-
| **host-path** | [SCONE] Host path, served directly from the host file system (use multiline to add multiple path) | No | - |
39-
| **heap** | [SCONE] Enclave heap size | No | 1G |
40-
| **dlopen** | [SCONE] Scone dlopen mode (0:disable; 1:enable) | No | 0 |
41-
| **mprotect** | [SCONE] Scone mprotect mode (0:disable; 1:enable) | No | 0 |
25+
| **Input** | **Description** | **Required** | **Default** |
26+
| ------------------- | -------------------------------------------------------------------------------------------------------- | ------------ | -------------------------------- |
27+
| **docker-registry** | Docker registry of docker image to sconify | No | docker.io |
28+
| **docker-username** | Docker registry username | Yes | - |
29+
| **image-name** | Name of docker image to sconify | Yes | - |
30+
| **image-tag** | Tag of docker image to sconify | Yes | - |
31+
| **sconify-version** | Version of the sconify image to use | Yes | - |
32+
| **binary** | [SCONE] Path of the binary to use | Yes | - |
33+
| **command** | [SCONE] Command to execute | No | ENTRYPOINT + CMD of native image |
34+
| **binary-fs** | [SCONE] Embed the file system into the binary via Scone binary file system | No | false |
35+
| **fs-dir** | [SCONE] Path of directories to add to the binary file system (use multiline to add multiple directories) | No | - |
36+
| **fs-file** | [SCONE] Path of files to add to the binary file system (use multiline to add multiple files) | No | - |
37+
| **host-path** | [SCONE] Host path, served directly from the host file system (use multiline to add multiple path) | No | - |
38+
| **heap** | [SCONE] Enclave heap size | No | 1G |
39+
| **dlopen** | [SCONE] Scone dlopen mode (0:disable; 1:enable) | No | 0 |
40+
| **mprotect** | [SCONE] Scone mprotect mode (0:disable; 1:enable) | No | 0 |
4241

4342
| **sconify-debug** | Create Scone debug image | No | true |
4443
| **sconify-prod** | Create Scone production image | No | true |
@@ -50,7 +49,9 @@ The workflow performs the following actions:
5049

5150
| **Secret** | **Description** | **Required** |
5251
| --------------------- | ----------------------------------------------- | --------------------------------------- |
52+
| **docker-username** | Docker registry username | yes |
5353
| **docker-password** | Docker Registry Password or Token | Yes |
54+
| **scontain-username** | Scontain registry username | Yes |
5455
| **scontain-password** | Scontain Registry Password or Token | Yes |
5556
| **scone-signing-key** | Signing Key for Scone Production (PEM RSA-3072) | Yes unless `inputs.sconify-prod: false` |
5657

@@ -113,9 +114,9 @@ jobs:
113114
heap: 1G
114115
dlopen: 1
115116
mprotect: 1
116-
docker-username: ${{ vars.DOCKER_USERNAME }}
117-
scontain-username: ${{ vars.SCONTAIN_USERNAME }}
118117
secrets:
118+
docker-username: ${{ secrets.DOCKER_USERNAME }}
119+
scontain-username: ${{ secrets.SCONTAIN_USERNAME }}
119120
docker-password: ${{ secrets.DOCKER_TOKEN }}
120121
scontain-password: ${{ secrets.SCONTAIN_TOKEN }}
121122
scone-signing-key: ${{ secrets.SCONE_SIGNING_KEY }}

0 commit comments

Comments
 (0)