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

Merge pull request #4836 from cevich/upd_base_meta

Browse Source 
Cirrus: Fix libpod base images going stale
This commit is contained in:
OpenShift Merge Robot
2020-01-13 08:39:00 +01:00
committed by GitHub
parent aa554d7ba2 49be255fee
commit c7d3b59da4
3 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.cirrus.yml
View File

@ -296,7 +296,7 @@ meta_task:
timeout_in: 10m timeout_in: 10m
# Cirrus-CI ignores entrypoint defined in image # Cirrus-CI ignores entrypoint defined in image
script: '/usr/local/bin/entrypoint.sh |& ${TIMESTAMP}' script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/update_meta.sh |& ${TIMESTAMP}'
# Remove old and disused images based on labels set by meta_task # Remove old and disused images based on labels set by meta_task

16
contrib/cirrus/lib.sh
View File

@ -64,8 +64,8 @@ export PACKER_BUILDS="${PACKER_BUILDS:-ubuntu-18,ubuntu-19,fedora-30,xfedora-30,
export UBUNTU_BASE_IMAGE="ubuntu-1904-disco-v20190724" export UBUNTU_BASE_IMAGE="ubuntu-1904-disco-v20190724"
export PRIOR_UBUNTU_BASE_IMAGE="ubuntu-1804-bionic-v20190722a" export PRIOR_UBUNTU_BASE_IMAGE="ubuntu-1804-bionic-v20190722a"
# Manually produced base-image names (see $SCRIPT_BASE/README.md) # Manually produced base-image names (see $SCRIPT_BASE/README.md)
export FEDORA_BASE_IMAGE="fedora-cloud-base-30-1-2-1565360543" export FEDORA_BASE_IMAGE="fedora-cloud-base-30-1-2-1578586410"
export PRIOR_FEDORA_BASE_IMAGE="fedora-cloud-base-29-1-2-1565360543" export PRIOR_FEDORA_BASE_IMAGE="fedora-cloud-base-29-1-2-1541789245"
export BUILT_IMAGE_SUFFIX="${BUILT_IMAGE_SUFFIX:--$CIRRUS_REPO_NAME-${CIRRUS_BUILD_ID}}" export BUILT_IMAGE_SUFFIX="${BUILT_IMAGE_SUFFIX:--$CIRRUS_REPO_NAME-${CIRRUS_BUILD_ID}}"
# IN_PODMAN container image # IN_PODMAN container image
IN_PODMAN_IMAGE="quay.io/libpod/in_podman:latest" IN_PODMAN_IMAGE="quay.io/libpod/in_podman:latest"
@ -430,6 +430,18 @@ remove_packaged_podman_files() {
sync && echo 3 > /proc/sys/vm/drop_caches sync && echo 3 > /proc/sys/vm/drop_caches
} }
canonicalize_image_names() {
req_env_var IMGNAMES
echo "Adding all current base images to \$IMGNAMES for timestamp update"
export IMGNAMES="\
$IMGNAMES
$UBUNTU_BASE_IMAGE
$PRIOR_UBUNTU_BASE_IMAGE
$FEDORA_BASE_IMAGE
$PRIOR_FEDORA_BASE_IMAGE
"
}
systemd_banish() { systemd_banish() {
$GOSRC/$PACKER_BASE/systemd_banish.sh $GOSRC/$PACKER_BASE/systemd_banish.sh
} }

22
contrib/cirrus/update_meta.sh Executable file
View File

@ -0,0 +1,22 @@
#!/bin/bash
source $(dirname $0)/lib.sh
# N/B: This script is expected to wrap $ENTRYPOINT when executing under the
# 'meta' Cirrus task on the libpod repo.
ENTRYPOINT=/usr/local/bin/entrypoint.sh
req_env_var IMGNAMES BUILDID REPOREF GCPJSON GCPNAME GCPPROJECT CIRRUS_CI
[[ -x "$ENTRYPOINT" ]] || \
die 2 "Expecting to find an installed entrypoint script $ENTRYPOINT."
# A better way of checking isn't compatible with old but functional images
# in-use by other repos.
grep -q 'compute images update' "$ENTRYPOINT" || \
die 3 "Expecting to be running inside a specific imgts container image"
canonicalize_image_names
# Executing inside a container; proper hand-off for process control
exec $ENTRYPOINT