opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 11:28:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cirrus: Use different CNI_COMMIT for Fedora

Browse Source 
Just noticed this in Dockerfile.Fedora.  Updated all the right
places to make this happen.

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich
2018-10-16 17:16:29 -04:00
parent 02bc3c9962
commit a18494a345
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.cirrus.yml
View File

@ -16,6 +16,7 @@ gce_instance:
# Main collection of env. varss to set for all scripts. All others # Main collection of env. varss to set for all scripts. All others
# are cooked in by $SCRIPT_BASE/setup_environment.sh # are cooked in by $SCRIPT_BASE/setup_environment.sh
env: env:
FEDORA_CNI_COMMIT: "412b6d31280682bb4fab4446f113c22ff1886554"
CNI_COMMIT: "7480240de9749f9a0a5c8614b17f1f03e0c06ab9" CNI_COMMIT: "7480240de9749f9a0a5c8614b17f1f03e0c06ab9"
CRIO_COMMIT: "662dbb31b5d4f5ed54511a47cde7190c61c28677" CRIO_COMMIT: "662dbb31b5d4f5ed54511a47cde7190c61c28677"
RUNC_COMMIT: "ad0f5255060d36872be04de22f8731f38ef2d7b1" RUNC_COMMIT: "ad0f5255060d36872be04de22f8731f38ef2d7b1"

3
contrib/cirrus/packer/libpod_images.json
View File

@ -1,5 +1,6 @@
{ {
"variables": { "variables": {
"FEDORA_CNI_COMMIT": "{{env `FEDORA_CNI_COMMIT`}}",
"CNI_COMMIT": "{{env `CNI_COMMIT`}}", "CNI_COMMIT": "{{env `CNI_COMMIT`}}",
"CRIO_COMMIT": "{{env `CRIO_COMMIT`}}", "CRIO_COMMIT": "{{env `CRIO_COMMIT`}}",
"RUNC_COMMIT": "{{env `RUNC_COMMIT`}}", "RUNC_COMMIT": "{{env `RUNC_COMMIT`}}",
@ -105,7 +106,7 @@
"script": "{{user `GOSRC`}}/{{user `PACKER_BASE`}}/fedora_setup.sh", "script": "{{user `GOSRC`}}/{{user `PACKER_BASE`}}/fedora_setup.sh",
"environment_vars": [ "environment_vars": [
"SCRIPT_BASE={{user `SCRIPT_BASE`}}", "SCRIPT_BASE={{user `SCRIPT_BASE`}}",
"CNI_COMMIT={{user `CNI_COMMIT`}}", "CNI_COMMIT={{user `FEDORA_CNI_COMMIT`}}",
"CRIO_COMMIT={{user `CRIO_COMMIT`}}", "CRIO_COMMIT={{user `CRIO_COMMIT`}}",
"RUNC_COMMIT={{user `RUNC_COMMIT`}}" "RUNC_COMMIT={{user `RUNC_COMMIT`}}"
] ]