Skip to content
Snippets Groups Projects
Verified Commit 619522a2 authored by Maik Nijhuis's avatar Maik Nijhuis
Browse files

Replace Ubuntu 20 build by Ubuntu 24 build

parent afa0b4b6
No related branches found
No related tags found
1 merge request!1267AST-1553 Remove IDG from Ubuntu 20 build; Add Ubuntu 24 build
Pipeline #84948 failed
This commit is part of merge request !1267. Comments created here will be created in the context of that merge request.
......@@ -37,8 +37,8 @@ versioning:
script:
# Unshallowing ensures that 'git log' works
- git fetch --unshallow
- echo BASE_IMAGE_2004=${CI_REGISTRY_IMAGE}/base_ubuntu20:$(git log -n 1 --pretty=format:%H -- docker/ubuntu_20_04_base) > versions.env
- echo BASE_IMAGE_2204=${CI_REGISTRY_IMAGE}/base_ubuntu22:$(git log -n 1 --pretty=format:%H -- docker/ubuntu_22_04_base) >> versions.env
- echo BASE_IMAGE_2204=${CI_REGISTRY_IMAGE}/base_ubuntu22:$(git log -n 1 --pretty=format:%H -- docker/ubuntu_22_04_base) > versions.env
- echo BASE_IMAGE_2404=${CI_REGISTRY_IMAGE}/base_ubuntu24:$(git log -n 1 --pretty=format:%H -- docker/ubuntu_24_04_base) >> versions.env
- cat versions.env
artifacts:
reports:
......@@ -88,20 +88,20 @@ prepare-base-2204:
optional: true
image: $BASE_IMAGE_2204
prepare-2004:
prepare-2404:
extends: .prepare
variables:
DOCKER_IMAGE: $BASE_IMAGE_2004
DOCKER_FILE: ./docker/ubuntu_20_04_base
DOCKER_IMAGE: $BASE_IMAGE_2404
DOCKER_FILE: ./docker/ubuntu_24_04_base
build-2004:
build-2404:
stage: build
extends: .failable
needs:
- job: versioning
- job: prepare-2004
- job: prepare-2404
optional: true
image: $BASE_IMAGE_2004
image: $BASE_IMAGE_2404
script:
# Build and run DP3
- mkdir build
......
......@@ -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/or [`docker/ubuntu_22_04_base`](docker/ubuntu_22_04_base) as examples.
Some non-standard dependencies of this project are: armadillo, boost, boost-python, casacore, hdf5, aoflagger, and EveryBeam. See the Dockerfiles [`docker/ubuntu_22_04_base`](docker/ubuntu_22_04_base) and/or [`docker/ubuntu_24_04_base`](docker/ubuntu_24_04_base) as examples.
Typical installation commands:
```
......
FROM ubuntu:20.04
FROM ubuntu:24.04
# TODO: needs to be bumped before next DP3 release
# ENV IDG_VERSION=0.8
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment