From 28debdfbbe2b452f4096c9e5d28b75cd7cda6077 Mon Sep 17 00:00:00 2001
From: Maik Nijhuis <maik.nijhuis@triopsys.nl>
Date: Fri, 26 Aug 2022 15:24:28 +0200
Subject: [PATCH] Remove extra build that stores a docker image on GitLab
---
.gitlab-ci.yml | 11 -----------
README.md | 2 +-
docker/ubuntu_20_04_dp3 | 12 ------------
3 files changed, 1 insertion(+), 24 deletions(-)
delete mode 100644 docker/ubuntu_20_04_dp3
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ea83829bc..e77b7dd17 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -153,17 +153,6 @@ build-2204:
paths:
- build
-build-release-2204:
- # .prepare should be last, since it overwrites "image:".
- extends: [".needs-base-2204",".prepare"]
- stage: build
- variables:
- DOCKER_IMAGE: ${CI_REGISTRY_IMAGE}/dp3:${CI_COMMIT_SHORT_SHA}
- DOCKER_FILE: ./docker/ubuntu_20_04_dp3
- DOCKER_BUILD_ARG: --build-arg BASE_TAG=$BASE_IMAGE_2204
- rules: # This job should always overwrite the rules: from .prepare!
- - if: '$CI_COMMIT_BRANCH == "master"'
-
build-doc-2204:
stage: build
extends: [".failable",".needs-base-2204"]
diff --git a/README.md b/README.md
index e29c6fb7b..890448cd3 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ The DP3 documentation can be found at: https://dp3.readthedocs.org
This repository is a continuation of the one at svn.astron.nl/LOFAR. In particular, it has branched off at LOFAR Release 3.2 (Sept 2018). The version of DP3 that is in the ASTRON repository is no longer maintained.
## Installation
-Some non-standard dependencies of this project are: armadillo, boost, boost-python, casacore, hdf5, aoflagger, and EveryBeam. See the Dockerfiles [`docker/ubuntu_20_04_base`](docker/ubuntu_20_04_base) and [`docker/ubuntu_20_04_dp3`](docker/ubuntu_20_04_dp3) as examples.
+Some non-standard dependencies of this project are: armadillo, boost, boost-python, casacore, hdf5, aoflagger, and EveryBeam. See the Dockerfiles [`docker/ubuntu_20_04_base`](docker/ubuntu_20_04_base) and/or [`docker/ubuntu_22_04_base`](docker/ubuntu_22_04_base) as examples.
Typical installation commands:
```
diff --git a/docker/ubuntu_20_04_dp3 b/docker/ubuntu_20_04_dp3
deleted file mode 100644
index 32ad630c6..000000000
--- a/docker/ubuntu_20_04_dp3
+++ /dev/null
@@ -1,12 +0,0 @@
-ARG BASE_TAG=latest
-FROM $BASE_TAG
-
-ADD . /src
-
-# Build DP3
-RUN mkdir /build && cd /build \
- && cmake ../src \
- && make -j$(($(nproc) / 2 > 0 ? $(nproc) / 2:1)) \
- && make install -j$(($(nproc) / 2 > 0 ? $(nproc) / 2:1)) \
- && DP3 \
- && rm -r /src /build
--
GitLab