mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-06-30 01:02:33 +00:00
rootfs: move code from rootfs.sh to lib.sh
Move some of the functions in rootfs.sh (generate_dockerfile, detect_go_version) in scripts/lib.sh, to make those functions reusable outside of rootfs.sh. Signed-off-by: Marco Vedovati <mvedovati@suse.com>
This commit is contained in:
Marco Vedovati
parent
39370c2aea
commit
8ebaac02d1
@ -14,17 +14,12 @@ script_name="${0##*/}"
|
|||||||
script_dir="$(dirname $(readlink -f $0))"
|
script_dir="$(dirname $(readlink -f $0))"
|
||||||
AGENT_VERSION=${AGENT_VERSION:-}
|
AGENT_VERSION=${AGENT_VERSION:-}
|
||||||
GO_AGENT_PKG=${GO_AGENT_PKG:-github.com/kata-containers/agent}
|
GO_AGENT_PKG=${GO_AGENT_PKG:-github.com/kata-containers/agent}
|
||||||
GO_RUNTIME_PKG=${GO_RUNTIME_PKG:-github.com/kata-containers/runtime}
|
|
||||||
AGENT_BIN=${AGENT_BIN:-kata-agent}
|
AGENT_BIN=${AGENT_BIN:-kata-agent}
|
||||||
AGENT_INIT=${AGENT_INIT:-no}
|
AGENT_INIT=${AGENT_INIT:-no}
|
||||||
KERNEL_MODULES_DIR=${KERNEL_MODULES_DIR:-""}
|
KERNEL_MODULES_DIR=${KERNEL_MODULES_DIR:-""}
|
||||||
OSBUILDER_VERSION="unknown"
|
OSBUILDER_VERSION="unknown"
|
||||||
DOCKER_RUNTIME=${DOCKER_RUNTIME:-runc}
|
DOCKER_RUNTIME=${DOCKER_RUNTIME:-runc}
|
||||||
GO_VERSION="null"
|
GO_VERSION="null"
|
||||||
#https://github.com/kata-containers/tests/blob/master/.ci/jenkins_job_build.sh
|
|
||||||
# Give preference to variable set by CI
|
|
||||||
KATA_BRANCH=${branch:-}
|
|
||||||
KATA_BRANCH=${KATA_BRANCH:-master}
|
|
||||||
export GOPATH=${GOPATH:-${HOME}/go}
|
export GOPATH=${GOPATH:-${HOME}/go}
|
||||||
|
|
||||||
lib_file="${script_dir}/../scripts/lib.sh"
|
lib_file="${script_dir}/../scripts/lib.sh"
|
||||||
@ -191,51 +186,6 @@ docker_extra_args()
|
|||||||
echo "$args"
|
echo "$args"
|
||||||
}
|
}
|
||||||
|
|
||||||
generate_dockerfile()
|
|
||||||
{
|
|
||||||
dir="$1"
|
|
||||||
|
|
||||||
case "$(uname -m)" in
|
|
||||||
"ppc64le")
|
|
||||||
goarch=ppc64le
|
|
||||||
;;
|
|
||||||
|
|
||||||
"aarch64")
|
|
||||||
goarch=arm64
|
|
||||||
;;
|
|
||||||
"s390x")
|
|
||||||
goarch=s390x
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
goarch=amd64
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
[ -n "$http_proxy" ] && readonly set_proxy="RUN sed -i '$ a proxy="$http_proxy"' /etc/dnf/dnf.conf /etc/yum.conf; true"
|
|
||||||
|
|
||||||
curlOptions=("-OL")
|
|
||||||
[ -n "$http_proxy" ] && curlOptions+=("-x $http_proxy")
|
|
||||||
readonly install_go="
|
|
||||||
RUN cd /tmp ; curl ${curlOptions[@]} https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${goarch}.tar.gz
|
|
||||||
RUN tar -C /usr/ -xzf /tmp/go${GO_VERSION}.linux-${goarch}.tar.gz
|
|
||||||
ENV GOROOT=/usr/go
|
|
||||||
ENV PATH=\$PATH:\$GOROOT/bin:\$GOPATH/bin
|
|
||||||
"
|
|
||||||
|
|
||||||
readonly dockerfile_template="Dockerfile.in"
|
|
||||||
[ -d "${dir}" ] || die "${dir}: not a directory"
|
|
||||||
pushd ${dir}
|
|
||||||
[ -f "${dockerfile_template}" ] || die "${dockerfile_template}: file not found"
|
|
||||||
sed \
|
|
||||||
-e "s|@GO_VERSION@|${GO_VERSION}|g" \
|
|
||||||
-e "s|@OS_VERSION@|${OS_VERSION}|g" \
|
|
||||||
-e "s|@INSTALL_GO@|${install_go//$'\n'/\\n}|g" \
|
|
||||||
-e "s|@SET_PROXY@|${set_proxy}|g" \
|
|
||||||
${dockerfile_template} > Dockerfile
|
|
||||||
popd
|
|
||||||
}
|
|
||||||
|
|
||||||
setup_agent_init()
|
setup_agent_init()
|
||||||
{
|
{
|
||||||
agent_bin="$1"
|
agent_bin="$1"
|
||||||
@ -276,50 +226,6 @@ error_handler()
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
detect_go_version()
|
|
||||||
{
|
|
||||||
info "Detecting agent go version"
|
|
||||||
typeset -r yq=$(command -v yq || command -v ${GOPATH}/bin/yq)
|
|
||||||
[ -z "$yq" ] && die "'yq' application not found (needed to parsing minimum Go version required)"
|
|
||||||
|
|
||||||
local runtimeRevision=""
|
|
||||||
|
|
||||||
# Detect runtime revision by fetching the agent's VERSION file
|
|
||||||
local runtime_version_url="https://raw.githubusercontent.com/kata-containers/agent/${AGENT_VERSION:-master}/VERSION"
|
|
||||||
info "Detecting runtime version using ${runtime_version_url}"
|
|
||||||
|
|
||||||
if runtimeRevision="$(curl -fsSL ${runtime_version_url})"; then
|
|
||||||
[ -n "${runtimeRevision}" ] || die "failed to get agent version"
|
|
||||||
typeset -r runtimeVersionsURL="https://raw.githubusercontent.com/kata-containers/runtime/${runtimeRevision}/versions.yaml"
|
|
||||||
info "Getting golang version from ${runtimeVersionsURL}"
|
|
||||||
# This may fail if we are a kata bump.
|
|
||||||
if GO_VERSION="$(curl -fsSL "$runtimeVersionsURL" | $yq r - "languages.golang.version")"; then
|
|
||||||
[ "$GO_VERSION" != "null" ]
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
info "Agent version has not match with a runtime version, assumming it is a PR"
|
|
||||||
local kata_runtime_pkg_dir="${GOPATH}/src/${GO_RUNTIME_PKG}"
|
|
||||||
if [ ! -d "${kata_runtime_pkg_dir}" ];then
|
|
||||||
info "There is not runtime repository in filesystem (${kata_runtime_pkg_dir})"
|
|
||||||
local runtime_versions_url="https://raw.githubusercontent.com/kata-containers/runtime/${KATA_BRANCH}/versions.yaml"
|
|
||||||
info "Get versions file from ${runtime_versions_url}"
|
|
||||||
GO_VERSION="$(curl -fsSL "${runtime_versions_url}" | $yq r - "languages.golang.version")"
|
|
||||||
if [ "$?" == "0" ] && [ "$GO_VERSION" != "null" ]; then
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
local kata_versions_file="${kata_runtime_pkg_dir}/versions.yaml"
|
|
||||||
info "Get Go version from ${kata_versions_file}"
|
|
||||||
GO_VERSION="$(cat "${kata_versions_file}" | $yq r - "languages.golang.version")"
|
|
||||||
|
|
||||||
[ "$?" == "0" ] && [ "$GO_VERSION" != "null" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
# Compares two SEMVER-style versions passed as arguments, up to the MINOR version
|
# Compares two SEMVER-style versions passed as arguments, up to the MINOR version
|
||||||
# number.
|
# number.
|
||||||
# Returns a zero exit code if the version specified by the first argument is
|
# Returns a zero exit code if the version specified by the first argument is
|
||||||
|
|||||||
100
scripts/lib.sh
100
scripts/lib.sh
@ -6,6 +6,13 @@
|
|||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
|
GO_AGENT_PKG=${GO_AGENT_PKG:-github.com/kata-containers/agent}
|
||||||
|
GO_RUNTIME_PKG=${GO_RUNTIME_PKG:-github.com/kata-containers/runtime}
|
||||||
|
#https://github.com/kata-containers/tests/blob/master/.ci/jenkins_job_build.sh
|
||||||
|
# Give preference to variable set by CI
|
||||||
|
KATA_BRANCH=${branch:-}
|
||||||
|
KATA_BRANCH=${KATA_BRANCH:-master}
|
||||||
|
|
||||||
error()
|
error()
|
||||||
{
|
{
|
||||||
local msg="$*"
|
local msg="$*"
|
||||||
@ -213,3 +220,96 @@ EOT
|
|||||||
local rootfs_file="${file_dir}/$(basename "${file}")"
|
local rootfs_file="${file_dir}/$(basename "${file}")"
|
||||||
info "Created summary file '${rootfs_file}' inside rootfs"
|
info "Created summary file '${rootfs_file}' inside rootfs"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# generate_dockerfile takes as only argument a path. It expects a Dockerfile.in
|
||||||
|
# Dockerfile template to be present in that path, and will generate a usable
|
||||||
|
# Dockerfile replacing the '@PLACEHOLDER@' in that Dockerfile
|
||||||
|
generate_dockerfile()
|
||||||
|
{
|
||||||
|
dir="$1"
|
||||||
|
[ -d "${dir}" ] || die "${dir}: not a directory"
|
||||||
|
|
||||||
|
case "$(uname -m)" in
|
||||||
|
"ppc64le")
|
||||||
|
goarch=ppc64le
|
||||||
|
;;
|
||||||
|
|
||||||
|
"aarch64")
|
||||||
|
goarch=arm64
|
||||||
|
;;
|
||||||
|
"s390x")
|
||||||
|
goarch=s390x
|
||||||
|
;;
|
||||||
|
|
||||||
|
*)
|
||||||
|
goarch=amd64
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
[ -n "${http_proxy:-}" ] && readonly set_proxy="RUN sed -i '$ a proxy="${http_proxy:-}"' /etc/dnf/dnf.conf /etc/yum.conf; true"
|
||||||
|
|
||||||
|
curlOptions=("-OL")
|
||||||
|
[ -n "${http_proxy:-}" ] && curlOptions+=("-x ${http_proxy:-}")
|
||||||
|
readonly install_go="
|
||||||
|
RUN cd /tmp ; curl ${curlOptions[@]} https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${goarch}.tar.gz
|
||||||
|
RUN tar -C /usr/ -xzf /tmp/go${GO_VERSION}.linux-${goarch}.tar.gz
|
||||||
|
ENV GOROOT=/usr/go
|
||||||
|
ENV PATH=\$PATH:\$GOROOT/bin:\$GOPATH/bin
|
||||||
|
"
|
||||||
|
|
||||||
|
readonly dockerfile_template="Dockerfile.in"
|
||||||
|
pushd ${dir}
|
||||||
|
[ -f "${dockerfile_template}" ] || die "${dockerfile_template}: file not found"
|
||||||
|
sed \
|
||||||
|
-e "s|@GO_VERSION@|${GO_VERSION}|g" \
|
||||||
|
-e "s|@OS_VERSION@|${OS_VERSION:-}|g" \
|
||||||
|
-e "s|@INSTALL_GO@|${install_go//$'\n'/\\n}|g" \
|
||||||
|
-e "s|@SET_PROXY@|${set_proxy:-}|g" \
|
||||||
|
${dockerfile_template} > Dockerfile
|
||||||
|
popd
|
||||||
|
}
|
||||||
|
|
||||||
|
detect_go_version()
|
||||||
|
{
|
||||||
|
info "Detecting agent go version"
|
||||||
|
typeset -r yq=$(command -v yq || command -v ${GOPATH}/bin/yq)
|
||||||
|
[ -z "$yq" ] && die "'yq' application not found (needed to parsing minimum Go version required)"
|
||||||
|
|
||||||
|
local runtimeRevision=""
|
||||||
|
|
||||||
|
# Detect runtime revision by fetching the agent's VERSION file
|
||||||
|
local runtime_version_url="https://raw.githubusercontent.com/kata-containers/agent/${AGENT_VERSION:-master}/VERSION"
|
||||||
|
info "Detecting runtime version using ${runtime_version_url}"
|
||||||
|
|
||||||
|
if runtimeRevision="$(curl -fsSL ${runtime_version_url})"; then
|
||||||
|
[ -n "${runtimeRevision}" ] || die "failed to get agent version"
|
||||||
|
typeset -r runtimeVersionsURL="https://raw.githubusercontent.com/kata-containers/runtime/${runtimeRevision}/versions.yaml"
|
||||||
|
info "Getting golang version from ${runtimeVersionsURL}"
|
||||||
|
# This may fail if we are a kata bump.
|
||||||
|
if GO_VERSION="$(curl -fsSL "$runtimeVersionsURL" | $yq r - "languages.golang.version")"; then
|
||||||
|
[ "$GO_VERSION" != "null" ]
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
info "Agent version has not match with a runtime version, assumming it is a PR"
|
||||||
|
local kata_runtime_pkg_dir="${GOPATH}/src/${GO_RUNTIME_PKG}"
|
||||||
|
if [ ! -d "${kata_runtime_pkg_dir}" ];then
|
||||||
|
info "There is not runtime repository in filesystem (${kata_runtime_pkg_dir})"
|
||||||
|
local runtime_versions_url="https://raw.githubusercontent.com/kata-containers/runtime/${KATA_BRANCH}/versions.yaml"
|
||||||
|
info "Get versions file from ${runtime_versions_url}"
|
||||||
|
GO_VERSION="$(curl -fsSL "${runtime_versions_url}" | $yq r - "languages.golang.version")"
|
||||||
|
if [ "$?" == "0" ] && [ "$GO_VERSION" != "null" ]; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
local kata_versions_file="${kata_runtime_pkg_dir}/versions.yaml"
|
||||||
|
info "Get Go version from ${kata_versions_file}"
|
||||||
|
GO_VERSION="$(cat "${kata_versions_file}" | $yq r - "languages.golang.version")"
|
||||||
|
|
||||||
|
[ "$?" == "0" ] && [ "$GO_VERSION" != "null" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user