github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-17 14:58:16 +00:00
Code Issues Projects Releases Wiki Activity

osbuilder: Make skopeo version externalised

Browse Source 
- Remove the hardcoded skopeo version arg
- Switch to read from version.yaml and pass via --build-arg

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This commit is contained in:
stevenhorsman
2023-01-16 17:06:30 +00:00
parent 9c75d43aef
commit e777860a0c
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/osbuilder/rootfs-builder/rootfs.sh
View File

@@ -388,10 +388,13 @@ build_rootfs_distro()
engine_build_args+=" --build-arg IMAGE_REGISTRY=${IMAGE_REGISTRY}" engine_build_args+=" --build-arg IMAGE_REGISTRY=${IMAGE_REGISTRY}"
fi fi
skopeo_version="$(get_package_version_from_kata_yaml externals.skopeo.version)"
# setup to install rust here # setup to install rust here
generate_dockerfile "${distro_config_dir}" generate_dockerfile "${distro_config_dir}"
"$container_engine" build \ "$container_engine" build \
${engine_build_args} \ ${engine_build_args} \
--build-arg SKOPEO_VERSION="${skopeo_version}" \
--build-arg http_proxy="${http_proxy}" \ --build-arg http_proxy="${http_proxy}" \
--build-arg https_proxy="${https_proxy}" \ --build-arg https_proxy="${https_proxy}" \
-t "${image_name}" "${distro_config_dir}" -t "${image_name}" "${distro_config_dir}"

2
tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in
View File

@@ -9,7 +9,7 @@ ARG IMAGE_REGISTRY=docker.io
FROM ${IMAGE_REGISTRY}/golang:1.18 AS skopeo FROM ${IMAGE_REGISTRY}/golang:1.18 AS skopeo
@SET_PROXY@ @SET_PROXY@
WORKDIR /skopeo WORKDIR /skopeo
ARG SKOPEO_VERSION="1.9.1" ARG SKOPEO_VERSION
RUN curl -fsSL "https://github.com/containers/skopeo/archive/v${SKOPEO_VERSION}.tar.gz" \ RUN curl -fsSL "https://github.com/containers/skopeo/archive/v${SKOPEO_VERSION}.tar.gz" \
| tar -xzf - --strip-components=1 | tar -xzf - --strip-components=1
RUN CGO_ENABLED=0 DISABLE_DOCS=1 make BUILDTAGS=containers_image_openpgp GO_DYN_FLAGS= RUN CGO_ENABLED=0 DISABLE_DOCS=1 make BUILDTAGS=containers_image_openpgp GO_DYN_FLAGS=