From 6ee2b4c5482ee0b32f35836da6a880e9e15449df Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Tue, 8 Jun 2021 11:33:34 +0200
Subject: [PATCH] SW-966: gitlab runner needs a container with git to build
lofar-pulp in
---
.gitlab-ci.yml | 11 +++++++++--
Docker/lofar-ci/Dockerfile_ci_pulp_builder | 11 +++++++++++
2 files changed, 20 insertions(+), 2 deletions(-)
create mode 100644 Docker/lofar-ci/Dockerfile_ci_pulp_builder
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e697893f88f..b8dd934c467 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,6 +43,13 @@ prepare_ci_mac_docker_image:
- docker build --build-arg BASE_VERSION=$CI_COMMIT_SHORT_SHA -t ci_mac:$CI_COMMIT_SHORT_SHA -f Docker/lofar-ci/Dockerfile_ci_mac .
interruptible: true
+prepare_ci_pulp_builder_docker_image:
+ stage: prepare
+ script:
+ - docker build --build-arg BASE_VERSION=$CI_COMMIT_SHORT_SHA -t ci_pulp_builder:$CI_COMMIT_SHORT_SHA -f Docker/lofar-ci/Dockerfile_ci_ci_pulp_builder .
+ interruptible: true
+
+
#
# BUILD STAGE
#
@@ -109,8 +116,8 @@ build_MCU_MAC:
build_pulp_docker_image:
stage: build
- # use ci_base:$CI_COMMIT_SHORT_SHA as an image to build in/with
- image: ci_base:$CI_COMMIT_SHORT_SHA
+ # use ci_pulp_builder:$CI_COMMIT_SHORT_SHA as an image to build in/with
+ image: ci_pulp_builder:$CI_COMMIT_SHORT_SHA
script:
- git clone https://git.astron.nl/ro/pulp-dockers
- cd pulp-dockers/lofar-pulp
diff --git a/Docker/lofar-ci/Dockerfile_ci_pulp_builder b/Docker/lofar-ci/Dockerfile_ci_pulp_builder
new file mode 100644
index 00000000000..a5abd36d7b0
--- /dev/null
+++ b/Docker/lofar-ci/Dockerfile_ci_pulp_builder
@@ -0,0 +1,11 @@
+#
+# This builds an image with all tools to clone and build to pulp-docker-file from https://git.astron.nl/ro/pulp-dockers
+#
+# base
+#
+ARG BASE_VERSION=latest
+FROM ci_base:$BASE_VERSION
+
+RUN echo "Installing packages/tools to build/clone..." && \
+ yum install -y git docker.io
+
--
GitLab