From 659248d16d2ee1b07d69e0402f34354ed4d383bd Mon Sep 17 00:00:00 2001
From: Auke Klazema <klazema@astron.nl>
Date: Fri, 24 Jun 2022 09:13:01 +0200
Subject: [PATCH] SDCH-3421: Cleanup code
---
.gitlab-ci.yml | 2 --
Docker/lofar-pulp/Dockerfile | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8ed4d722e2..e2a7984b83e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -239,8 +239,6 @@ build_lofar_pulp_docker_image:
- docker push $CI_NEXUS_REGISTRY_LOCATION/ci_lofar_pulp:$CI_COMMIT_SHORT_SHA
- docker logout $CI_NEXUS_REGISTRY
interruptible: true
- needs:
- - prepare_ci_base_docker_image
when: manual # pulp docker images take a long time to build. It does not/hardly depend on currently developed lofar code. So an automatic build for each lofar commit is not needed.
build_Docker:
diff --git a/Docker/lofar-pulp/Dockerfile b/Docker/lofar-pulp/Dockerfile
index 4137a478e59..8cd9a1e14f0 100644
--- a/Docker/lofar-pulp/Dockerfile
+++ b/Docker/lofar-pulp/Dockerfile
@@ -29,9 +29,9 @@ RUN apt-get update && apt-get install -y sasl2-bin libuuid1 libnss3 libnspr4 xqi
# QPID daemon legacy store would require: libaio-dev libdb5.1++-dev
RUN apt-get update && apt-get install -y ruby ruby-dev libsasl2-dev uuid-dev libxerces-c-dev libnss3-dev libnspr4-dev help2man libsslcommon2-dev libxqilla-dev libboost-program-options${BOOST_VERSION}-dev libboost-filesystem${BOOST_VERSION}-dev && \
mkdir -p /opt/qpid/src && \
- git clone --depth=1 -b SDCH-3421 https://git.astron.nl/ro/lofar.git /opt/qpid/src && \
+ git clone --depth=1 https://git.astron.nl/ro/lofar.git /opt/qpid/src && \
cd /opt/qpid/src/LCS/MessageBus/qpid && \
- bash -c "HOME=/tmp /opt/qpid/src/LCS/MessageBus/qpid/local/sbin/build_qpid" && \
+ bash -c "HOME=/tmp /opt/qpid/src/LCS/MessageBus/qpid/local/sbin/build_qpid" && \
bash -c "strip /opt/qpid/{bin,lib}/* || true" && \
bash -c "rm -rf /tmp/sources /opt/qpid/src" && \
apt-get purge -y ruby ruby-dev libsasl2-dev uuid-dev libxerces-c-dev libnss3-dev libnspr4-dev help2man libsslcommon2-dev libxqilla-dev libboost-program-options${BOOST_VERSION}-dev libboost-filesystem${BOOST_VERSION}-dev && \
--
GitLab