Name: remote-installer
Version: %{_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Contains components for the remote-installer
Group: %{_platform_group}
License: %{_platform_licence}
Source0: %{name}-%{version}.tar.gz
Vendor: %{_platform_vendor}
-
-BuildArch: noarch
+BuildArch: %{_arch}
# BuildRequires: docker
%prep
%build
-docker build \
- --network=host \
- --no-cache \
- --force-rm \
- --build-arg HTTP_PROXY="${http_proxy}" \
- --build-arg HTTPS_PROXY="${https_proxy}" \
- --build-arg NO_PROXY="${no_proxy}" \
- --build-arg http_proxy="${http_proxy}" \
- --build-arg https_proxy="${https_proxy}" \
- --build-arg no_proxy="${no_proxy}" \
- --tag remote-installer \
- --file docker-build/remote-installer/Dockerfile .
+BASEIMAGE_TAG='centos:7.6.1810'
+
+# For aarch64 use the closest available upstream version
+if [ "%{_arch}" = "aarch64" ]; then
+ BASEIMAGE_TAG='centos@sha256:df89b0a0b42916b5b31b334fd52d3e396c226ad97dfe772848bdd6b00fb42bf0'
+fi
+
+scripts/build.sh -t "${BASEIMAGE_TAG}"
# Here hould be some registry but it should be handled by a Jenkis job
docker image save remote-installer >remote-installer-image.tar
cd "$(dirname "$0")"/..
TAR_IMAGE="remote-installer.tar"
+DOCKERFILE='docker-build/remote-installer/Dockerfile'
help()
{
- echo -e "$(basename $0) [-hs]"
- echo -e " -h display this help"
- echo -e " -s save image as tar to $TAR_IMAGE"
+ echo -e "$(basename "$0") [-hs] -t <tag>"
+ echo -e " -h display this help"
+ echo -e " -s save image as tar to $TAR_IMAGE"
+ echo -e " -t <tag> specify docker base image tag"
echo
echo -e "Proxy configuration is taken from environment variables"
echo -e "http_proxy, https_proxy and no_proxy"
}
-while getopts "hs" arg; do
+while getopts "hst:" arg; do
case $arg in
h)
help
- exit 0
+ exit 0
;;
s)
- SAVE_IMAGE="yes"
+ SAVE_IMAGE="yes"
+ ;;
+ t)
+ BASEIMAGE_TAG="$OPTARG"
;;
esac
done
docker build \
+ --network=host \
--no-cache \
--force-rm \
+ --build-arg BASEIMAGE_TAG="${BASEIMAGE_TAG}" \
--build-arg HTTP_PROXY="${http_proxy}" \
--build-arg HTTPS_PROXY="${https_proxy}" \
--build-arg NO_PROXY="${no_proxy}" \
--build-arg https_proxy="${https_proxy}" \
--build-arg no_proxy="${no_proxy}" \
--tag remote-installer \
- --file docker-build/remote-installer/Dockerfile .
+ --file "${DOCKERFILE}" .
# could be compressed but it's only used until there is an registry