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

add basic support for workshop's userenv build-policy parameter #541

Merged
merged 1 commit into from
Aug 16, 2024
Merged

add basic support for workshop's userenv build-policy parameter #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions rickshaw-run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,6 +956,9 @@ sub source_container_image {
@$userenv_ref{'requirements'} = \@reqs;
$$userenv_ref{'userenv'}{'origin'}{'image'} = $run{'dest-image-url'};
$$userenv_ref{'userenv'}{'origin'}{'tag'} = $tag;
if (defined $$userenv_ref{'userenv'}{'origin'}{'build-policy'}) {
delete $$userenv_ref{'userenv'}{'origin'}{'build-policy'};
}
my $userenv_file = $config_dir . "/userenv-" . $tag . ".json";
put_json_file($userenv_file, $userenv_ref);
$userenv_arg = " --userenv " . $userenv_file;
Expand Down
5 changes: 3 additions & 2 deletions userenvs/alma8.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{
"workshop": {
"schema": {
"version": "2023.02.16"
"version": "2024.08.07"
}
},
"userenv": {
"name": "alma8",
"label": "AlmaLinux 8",
"origin": {
"image": "quay.io/almalinuxorg/8-base",
"tag": "8"
"tag": "8",
"build-policy": "missing"
},
"properties": {
"platform": [
Expand Down
3 changes: 2 additions & 1 deletion userenvs/alma8/userenv.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"label": "AlmaLinux 8",
"origin": {
"image": "quay.io/almalinuxorg/8-base",
"tag": "8"
"tag": "8",
"build-policy": "missing"
},
"properties": {
"platform": [
Expand Down
5 changes: 3 additions & 2 deletions userenvs/alma9.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{
"workshop": {
"schema": {
"version": "2023.02.16"
"version": "2024.08.07"
}
},
"userenv": {
"name": "alma9",
"label": "AlmaLinux 9",
"origin": {
"image": "quay.io/almalinux/almalinux",
"tag": "9"
"tag": "9",
"build-policy": "missing"
},
"properties": {
"platform": [
Expand Down
3 changes: 2 additions & 1 deletion userenvs/alma9/userenv.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"label": "AlmaLinux 9",
"origin": {
"image": "quay.io/almalinux/almalinux",
"tag": "9"
"tag": "9",
"build-policy": "missing"
},
"properties": {
"platform": [
Expand Down
2 changes: 1 addition & 1 deletion userenvs/components/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"workshop": {
"schema": {
"version": "2023.02.16"
"version": "2024.08.07"
}
},
5 changes: 3 additions & 2 deletions userenvs/fedora38.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{
"workshop": {
"schema": {
"version": "2023.02.16"
"version": "2024.08.07"
}
},
"userenv": {
"name": "fedora38",
"label": "Fedora 38",
"origin": {
"image": "registry.fedoraproject.org/fedora",
"tag": "38"
"tag": "38",
"build-policy": "missing"
},
"properties": {
"platform": [
Expand Down
3 changes: 2 additions & 1 deletion userenvs/fedora38/userenv.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"label": "Fedora 38",
"origin": {
"image": "registry.fedoraproject.org/fedora",
"tag": "38"
"tag": "38",
"build-policy": "missing"
},
"properties": {
"platform": [
Expand Down
5 changes: 3 additions & 2 deletions userenvs/fedora39.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{
"workshop": {
"schema": {
"version": "2023.02.16"
"version": "2024.08.07"
}
},
"userenv": {
"name": "fedora39",
"label": "Fedora 39",
"origin": {
"image": "registry.fedoraproject.org/fedora",
"tag": "39"
"tag": "39",
"build-policy": "missing"
},
"properties": {
"platform": [
Expand Down
3 changes: 2 additions & 1 deletion userenvs/fedora39/userenv.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"label": "Fedora 39",
"origin": {
"image": "registry.fedoraproject.org/fedora",
"tag": "39"
"tag": "39",
"build-policy": "missing"
},
"properties": {
"platform": [
Expand Down
3 changes: 2 additions & 1 deletion userenvs/rhel-ai.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"label": "RHEL AI",
"origin": {
"image": "quay.io/kvalin/instructlab-training",
"tag": "latest-jul10"
"tag": "latest-jul10",
"build-policy": "ifnewer"
},
"properties": {
"platform": [
Expand Down
3 changes: 2 additions & 1 deletion userenvs/rhel-ai/userenv.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"label": "RHEL AI",
"origin": {
"image": "quay.io/kvalin/instructlab-training",
"tag": "latest-jul10"
"tag": "latest-jul10",
"build-policy": "ifnewer"
},
"properties": {
"platform": [
Expand Down
5 changes: 3 additions & 2 deletions userenvs/rhubi8.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{
"workshop": {
"schema": {
"version": "2023.02.16"
"version": "2024.08.07"
}
},
"userenv": {
"name": "rhubi8",
"label": "Red Hat UBI 8",
"origin": {
"image": "registry.access.redhat.com/ubi8/ubi",
"tag": "latest"
"tag": "latest",
"build-policy": "missing"
},
"properties": {
"platform": [
Expand Down
3 changes: 2 additions & 1 deletion userenvs/rhubi8/userenv.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"label": "Red Hat UBI 8",
"origin": {
"image": "registry.access.redhat.com/ubi8/ubi",
"tag": "latest"
"tag": "latest",
"build-policy": "missing"
},
"properties": {
"platform": [
Expand Down
5 changes: 3 additions & 2 deletions userenvs/rhubi9.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{
"workshop": {
"schema": {
"version": "2023.02.16"
"version": "2024.08.07"
}
},
"userenv": {
"name": "rhubi9",
"label": "Red Hat UBI 9",
"origin": {
"image": "registry.access.redhat.com/ubi9/ubi",
"tag": "latest"
"tag": "latest",
"build-policy": "missing"
},
"properties": {
"platform": [
Expand Down
3 changes: 2 additions & 1 deletion userenvs/rhubi9/userenv.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"label": "Red Hat UBI 9",
"origin": {
"image": "registry.access.redhat.com/ubi9/ubi",
"tag": "latest"
"tag": "latest",
"build-policy": "missing"
},
"properties": {
"platform": [
Expand Down
2 changes: 1 addition & 1 deletion userenvs/stream8-flexran.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"workshop": {
"schema": {
"version": "2023.02.16"
"version": "2024.08.07"
}
},
"userenv": {
Expand Down
5 changes: 3 additions & 2 deletions userenvs/stream9.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{
"workshop": {
"schema": {
"version": "2023.02.16"
"version": "2024.08.07"
}
},
"userenv": {
"name": "stream9",
"label": "CentOS Stream 9",
"origin": {
"image": "quay.io/centos/centos",
"tag": "stream9"
"tag": "stream9",
"build-policy": "missing"
},
"properties": {
"platform": [
Expand Down
3 changes: 2 additions & 1 deletion userenvs/stream9/userenv.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"label": "CentOS Stream 9",
"origin": {
"image": "quay.io/centos/centos",
"tag": "stream9"
"tag": "stream9",
"build-policy": "missing"
},
"properties": {
"platform": [
Expand Down
Loading