Move repo logic in the dockerfiles

in order to ease the build without build.sh

Signed-off-by: Gaëtan Lehmann <[email protected]>

Author: glehmann

Dockerfile-7.x

@@ -1,4 +1,6 @@
-FROM    centos:7.2.1511
+ARG CENTOS_VERSION=7.2.1511
+
+FROM    centos:${CENTOS_VERSION}
 
 ARG     CUSTOM_BUILDER_UID=""
 ARG     CUSTOM_BUILDER_GID=""
@@ -7,11 +9,15 @@ ARG     CUSTOM_BUILDER_GID=""
 RUN     rm /etc/yum.repos.d/*
 
 # Add only the specific CentOS 7.2 repositories, because that's what XS used for the majority of packages
-COPY    files/tmp-CentOS-Vault.repo /etc/yum.repos.d/CentOS-Vault-7.2.repo
+ARG CENTOS_VERSION
+COPY    files/CentOS-Vault.repo.in /etc/yum.repos.d/CentOS-Vault-7.2.repo
+RUN     sed -e "s/@CENTOS_VERSION@/${CENTOS_VERSION}/g" -i /etc/yum.repos.d/CentOS-Vault-7.2.repo
 
 # Add our repositories
 # Repository file depends on the target version of XCP-ng, and is pre-processed by build.sh
-COPY    files/tmp-xcp-ng.repo /etc/yum.repos.d/xcp-ng.repo
+ARG XCP_NG_BRANCH=7.6
+COPY    files/xcp-ng.repo.7.x.in /etc/yum.repos.d/xcp-ng.repo
+RUN     sed -e "s/@XCP_NG_BRANCH@/${XCP_NG_BRANCH}/g" -i /etc/yum.repos.d/xcp-ng.repo
 
 # Fix invalid rpmdb checksum error with overlayfs, see https://github.com/docker/docker/issues/10180
 RUN     yum install -y yum-plugin-ovl

Dockerfile-8.x

@@ -1,4 +1,6 @@
-FROM    centos:7.5.1804
+ARG CENTOS_VERSION=7.5.1804
+
+FROM    centos:${CENTOS_VERSION}
 
 ARG     CUSTOM_BUILDER_UID=""
 ARG     CUSTOM_BUILDER_GID=""
@@ -7,11 +9,15 @@ ARG     CUSTOM_BUILDER_GID=""
 RUN     rm /etc/yum.repos.d/*
 
 # Add only the specific CentOS 7.5 repositories, because that's what XS used for the majority of packages
-COPY    files/tmp-CentOS-Vault.repo /etc/yum.repos.d/CentOS-Vault-7.5.repo
+ARG CENTOS_VERSION
+COPY    files/CentOS-Vault.repo.in /etc/yum.repos.d/CentOS-Vault-7.5.repo
+RUN     sed -e "s/@CENTOS_VERSION@/${CENTOS_VERSION}/g" -i /etc/yum.repos.d/CentOS-Vault-7.5.repo
 
 # Add our repositories
 # Repository file depends on the target version of XCP-ng, and is pre-processed by build.sh
-COPY    files/tmp-xcp-ng.repo /etc/yum.repos.d/xcp-ng.repo
+ARG XCP_NG_BRANCH=8.3
+COPY    files/xcp-ng.repo.8.x.in /etc/yum.repos.d/xcp-ng.repo
+RUN     sed -e "s/@XCP_NG_BRANCH@/${XCP_NG_BRANCH}/g" -i /etc/yum.repos.d/xcp-ng.repo
 
 # Install GPG key
 RUN     curl -sSf https://xcp-ng.org/RPM-GPG-KEY-xcpng -o /etc/pki/rpm-gpg/RPM-GPG-KEY-xcpng

build.sh

@@ -76,15 +76,11 @@ case "$1" in
         : ${PLATFORM:=linux/amd64/v2}
         ;;
     8.*)
-        REPO_FILE=files/xcp-ng.repo.8.x.in
         DOCKERFILE=Dockerfile-8.x
-        CENTOS_VERSION=7.5.1804
         : ${PLATFORM:=linux/amd64}
         ;;
     7.*)
-        REPO_FILE=files/xcp-ng.repo.7.x.in
         DOCKERFILE=Dockerfile-7.x
-        CENTOS_VERSION=7.2.1511
         : ${PLATFORM:=linux/amd64}
         ;;
     *)
@@ -93,11 +89,6 @@ case "$1" in
         ;;
 esac
 
-if [ -n "$CENTOS_VERSION" ]; then
-    sed -e "s/@XCP_NG_BRANCH@/${1}/g" "$REPO_FILE" > files/tmp-xcp-ng.repo
-    sed -e "s/@CENTOS_VERSION@/${CENTOS_VERSION}/g" files/CentOS-Vault.repo.in > files/tmp-CentOS-Vault.repo
-fi
-
 CUSTOM_UID="$(id -u)"
 CUSTOM_GID="$(id -g)"
 
@@ -121,8 +112,6 @@ CUSTOM_ARGS+=( "--build-arg" "CUSTOM_BUILDER_GID=${CUSTOM_GID}" )
     --platform "$PLATFORM" \
     "${CUSTOM_ARGS[@]}" \
     -t xcp-ng/xcp-ng-build-env:${1} \
+    --build-arg XCP_NG_BRANCH=${1} \
     --ulimit nofile=1024 \
     -f $DOCKERFILE .
-
-rm -f files/tmp-xcp-ng.repo
-rm -f files/tmp-CentOS-Vault.repo