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.

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

Automated Containerd version update 1.6.33 #5302

Merged
merged 1 commit into from
Aug 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions addons/containerd/1.5.10/Manifest
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
yum libzstd
yum container-selinux
asset runc https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.amd64
dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.5.10
dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.5.10
Expand Down
19 changes: 19 additions & 0 deletions addons/containerd/1.5.10/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ function containerd_install() {
function containerd_host_init() {
require_centos8_containerd
containerd_install_libzstd_if_missing
containerd_install_container_selinux_if_missing
}

function containerd_install_libzstd_if_missing() {
Expand All @@ -129,6 +130,24 @@ function containerd_install_libzstd_if_missing() {
esac
}

# install container-selinux independently of containerd.io on centos/rhel/ol 7
function containerd_install_container_selinux_if_missing() {
local src="$DIR/addons/containerd/$CONTAINERD_VERSION"

if [ "$DIST_VERSION_MAJOR" != "7" ]; then
return
fi

case "$LSB_DIST" in
centos|rhel|ol)
if yum_is_host_package_installed container-selinux ; then
return
fi
yum_install_host_archives "$src" container-selinux
;;
esac
}

function containerd_configure() {
if [ "$CONTAINERD_PRESERVE_CONFIG" = "1" ]; then
log "Skipping containerd configuration in order to preserve config."
Expand Down
1 change: 1 addition & 0 deletions addons/containerd/1.5.11/Manifest
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
yum libzstd
yum container-selinux
asset runc https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.amd64
dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.5.11
dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.5.11
Expand Down
19 changes: 19 additions & 0 deletions addons/containerd/1.5.11/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ function containerd_install() {
function containerd_host_init() {
require_centos8_containerd
containerd_install_libzstd_if_missing
containerd_install_container_selinux_if_missing
}

function containerd_install_libzstd_if_missing() {
Expand All @@ -129,6 +130,24 @@ function containerd_install_libzstd_if_missing() {
esac
}

# install container-selinux independently of containerd.io on centos/rhel/ol 7
function containerd_install_container_selinux_if_missing() {
local src="$DIR/addons/containerd/$CONTAINERD_VERSION"

if [ "$DIST_VERSION_MAJOR" != "7" ]; then
return
fi

case "$LSB_DIST" in
centos|rhel|ol)
if yum_is_host_package_installed container-selinux ; then
return
fi
yum_install_host_archives "$src" container-selinux
;;
esac
}

function containerd_configure() {
if [ "$CONTAINERD_PRESERVE_CONFIG" = "1" ]; then
log "Skipping containerd configuration in order to preserve config."
Expand Down
1 change: 1 addition & 0 deletions addons/containerd/1.6.10/Manifest
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
yum libzstd
yum container-selinux
asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.10
dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.10
Expand Down
19 changes: 19 additions & 0 deletions addons/containerd/1.6.10/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ function containerd_install() {
function containerd_host_init() {
require_centos8_containerd
containerd_install_libzstd_if_missing
containerd_install_container_selinux_if_missing
}

function containerd_install_libzstd_if_missing() {
Expand All @@ -129,6 +130,24 @@ function containerd_install_libzstd_if_missing() {
esac
}

# install container-selinux independently of containerd.io on centos/rhel/ol 7
function containerd_install_container_selinux_if_missing() {
local src="$DIR/addons/containerd/$CONTAINERD_VERSION"

if [ "$DIST_VERSION_MAJOR" != "7" ]; then
return
fi

case "$LSB_DIST" in
centos|rhel|ol)
if yum_is_host_package_installed container-selinux ; then
return
fi
yum_install_host_archives "$src" container-selinux
;;
esac
}

function containerd_configure() {
if [ "$CONTAINERD_PRESERVE_CONFIG" = "1" ]; then
log "Skipping containerd configuration in order to preserve config."
Expand Down
1 change: 1 addition & 0 deletions addons/containerd/1.6.11/Manifest
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
yum libzstd
yum container-selinux
asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.11
dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.11
Expand Down
19 changes: 19 additions & 0 deletions addons/containerd/1.6.11/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ function containerd_install() {
function containerd_host_init() {
require_centos8_containerd
containerd_install_libzstd_if_missing
containerd_install_container_selinux_if_missing
}

function containerd_install_libzstd_if_missing() {
Expand All @@ -129,6 +130,24 @@ function containerd_install_libzstd_if_missing() {
esac
}

# install container-selinux independently of containerd.io on centos/rhel/ol 7
function containerd_install_container_selinux_if_missing() {
local src="$DIR/addons/containerd/$CONTAINERD_VERSION"

if [ "$DIST_VERSION_MAJOR" != "7" ]; then
return
fi

case "$LSB_DIST" in
centos|rhel|ol)
if yum_is_host_package_installed container-selinux ; then
return
fi
yum_install_host_archives "$src" container-selinux
;;
esac
}

function containerd_configure() {
if [ "$CONTAINERD_PRESERVE_CONFIG" = "1" ]; then
log "Skipping containerd configuration in order to preserve config."
Expand Down
1 change: 1 addition & 0 deletions addons/containerd/1.6.12/Manifest
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
yum libzstd
yum container-selinux
asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.12
dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.12
Expand Down
19 changes: 19 additions & 0 deletions addons/containerd/1.6.12/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ function containerd_install() {
function containerd_host_init() {
require_centos8_containerd
containerd_install_libzstd_if_missing
containerd_install_container_selinux_if_missing
}

function containerd_install_libzstd_if_missing() {
Expand All @@ -129,6 +130,24 @@ function containerd_install_libzstd_if_missing() {
esac
}

# install container-selinux independently of containerd.io on centos/rhel/ol 7
function containerd_install_container_selinux_if_missing() {
local src="$DIR/addons/containerd/$CONTAINERD_VERSION"

if [ "$DIST_VERSION_MAJOR" != "7" ]; then
return
fi

case "$LSB_DIST" in
centos|rhel|ol)
if yum_is_host_package_installed container-selinux ; then
return
fi
yum_install_host_archives "$src" container-selinux
;;
esac
}

function containerd_configure() {
if [ "$CONTAINERD_PRESERVE_CONFIG" = "1" ]; then
log "Skipping containerd configuration in order to preserve config."
Expand Down
1 change: 1 addition & 0 deletions addons/containerd/1.6.13/Manifest
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
yum libzstd
yum container-selinux
asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.13
dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.13
Expand Down
19 changes: 19 additions & 0 deletions addons/containerd/1.6.13/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ function containerd_install() {
function containerd_host_init() {
require_centos8_containerd
containerd_install_libzstd_if_missing
containerd_install_container_selinux_if_missing
}

function containerd_install_libzstd_if_missing() {
Expand All @@ -129,6 +130,24 @@ function containerd_install_libzstd_if_missing() {
esac
}

# install container-selinux independently of containerd.io on centos/rhel/ol 7
function containerd_install_container_selinux_if_missing() {
local src="$DIR/addons/containerd/$CONTAINERD_VERSION"

if [ "$DIST_VERSION_MAJOR" != "7" ]; then
return
fi

case "$LSB_DIST" in
centos|rhel|ol)
if yum_is_host_package_installed container-selinux ; then
return
fi
yum_install_host_archives "$src" container-selinux
;;
esac
}

function containerd_configure() {
if [ "$CONTAINERD_PRESERVE_CONFIG" = "1" ]; then
log "Skipping containerd configuration in order to preserve config."
Expand Down
1 change: 1 addition & 0 deletions addons/containerd/1.6.14/Manifest
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
yum libzstd
yum container-selinux
asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.14
dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.14
Expand Down
19 changes: 19 additions & 0 deletions addons/containerd/1.6.14/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ function containerd_install() {
function containerd_host_init() {
require_centos8_containerd
containerd_install_libzstd_if_missing
containerd_install_container_selinux_if_missing
}

function containerd_install_libzstd_if_missing() {
Expand All @@ -129,6 +130,24 @@ function containerd_install_libzstd_if_missing() {
esac
}

# install container-selinux independently of containerd.io on centos/rhel/ol 7
function containerd_install_container_selinux_if_missing() {
local src="$DIR/addons/containerd/$CONTAINERD_VERSION"

if [ "$DIST_VERSION_MAJOR" != "7" ]; then
return
fi

case "$LSB_DIST" in
centos|rhel|ol)
if yum_is_host_package_installed container-selinux ; then
return
fi
yum_install_host_archives "$src" container-selinux
;;
esac
}

function containerd_configure() {
if [ "$CONTAINERD_PRESERVE_CONFIG" = "1" ]; then
log "Skipping containerd configuration in order to preserve config."
Expand Down
1 change: 1 addition & 0 deletions addons/containerd/1.6.15/Manifest
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
yum libzstd
yum container-selinux
asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.15
dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.15
Expand Down
19 changes: 19 additions & 0 deletions addons/containerd/1.6.15/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ function containerd_install() {
function containerd_host_init() {
require_centos8_containerd
containerd_install_libzstd_if_missing
containerd_install_container_selinux_if_missing
}

function containerd_install_libzstd_if_missing() {
Expand All @@ -129,6 +130,24 @@ function containerd_install_libzstd_if_missing() {
esac
}

# install container-selinux independently of containerd.io on centos/rhel/ol 7
function containerd_install_container_selinux_if_missing() {
local src="$DIR/addons/containerd/$CONTAINERD_VERSION"

if [ "$DIST_VERSION_MAJOR" != "7" ]; then
return
fi

case "$LSB_DIST" in
centos|rhel|ol)
if yum_is_host_package_installed container-selinux ; then
return
fi
yum_install_host_archives "$src" container-selinux
;;
esac
}

function containerd_configure() {
if [ "$CONTAINERD_PRESERVE_CONFIG" = "1" ]; then
log "Skipping containerd configuration in order to preserve config."
Expand Down
1 change: 1 addition & 0 deletions addons/containerd/1.6.16/Manifest
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
yum libzstd
yum container-selinux
asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.16
dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.16
Expand Down
19 changes: 19 additions & 0 deletions addons/containerd/1.6.16/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ function containerd_install() {
function containerd_host_init() {
require_centos8_containerd
containerd_install_libzstd_if_missing
containerd_install_container_selinux_if_missing
}

function containerd_install_libzstd_if_missing() {
Expand All @@ -129,6 +130,24 @@ function containerd_install_libzstd_if_missing() {
esac
}

# install container-selinux independently of containerd.io on centos/rhel/ol 7
function containerd_install_container_selinux_if_missing() {
local src="$DIR/addons/containerd/$CONTAINERD_VERSION"

if [ "$DIST_VERSION_MAJOR" != "7" ]; then
return
fi

case "$LSB_DIST" in
centos|rhel|ol)
if yum_is_host_package_installed container-selinux ; then
return
fi
yum_install_host_archives "$src" container-selinux
;;
esac
}

function containerd_configure() {
if [ "$CONTAINERD_PRESERVE_CONFIG" = "1" ]; then
log "Skipping containerd configuration in order to preserve config."
Expand Down
1 change: 1 addition & 0 deletions addons/containerd/1.6.18/Manifest
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
yum libzstd
yum container-selinux
asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.18
dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.18
Expand Down
19 changes: 19 additions & 0 deletions addons/containerd/1.6.18/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ function containerd_install() {
function containerd_host_init() {
require_centos8_containerd
containerd_install_libzstd_if_missing
containerd_install_container_selinux_if_missing
}

function containerd_install_libzstd_if_missing() {
Expand All @@ -129,6 +130,24 @@ function containerd_install_libzstd_if_missing() {
esac
}

# install container-selinux independently of containerd.io on centos/rhel/ol 7
function containerd_install_container_selinux_if_missing() {
local src="$DIR/addons/containerd/$CONTAINERD_VERSION"

if [ "$DIST_VERSION_MAJOR" != "7" ]; then
return
fi

case "$LSB_DIST" in
centos|rhel|ol)
if yum_is_host_package_installed container-selinux ; then
return
fi
yum_install_host_archives "$src" container-selinux
;;
esac
}

function containerd_configure() {
if [ "$CONTAINERD_PRESERVE_CONFIG" = "1" ]; then
log "Skipping containerd configuration in order to preserve config."
Expand Down
1 change: 1 addition & 0 deletions addons/containerd/1.6.19/Manifest
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
yum libzstd
yum container-selinux
asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.19
dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.19
Expand Down
Loading
Loading