From ca367f7c2ba749339468275d4df338c3a78a42df Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Fri, 23 Jun 2023 21:40:46 +0000
Subject: [PATCH] feat: upgrade base images
---
.gitlab-ci.yml | 9 ++++++---
containers/debian/base.Dockerfile | 6 +++---
containers/jug/dev.Dockerfile | 2 +-
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 957d813ed..a533381dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -161,10 +161,13 @@ version:
base:
parallel:
matrix:
- - BASE_IMAGE: debian:testing-20220822-slim
+ - BASE_IMAGE: debian:testing-slim
BUILD_IMAGE: debian_testing_base
PLATFORM: linux/amd64,linux/arm64/v8
- - BASE_IMAGE: ubuntu:20.04
+ - BASE_IMAGE: debian:stable-slim
+ BUILD_IMAGE: debian_stable_base
+ PLATFORM: linux/amd64,linux/arm64/v8
+ - BASE_IMAGE: ubuntu:22.04
BUILD_IMAGE: ubuntu_base
PLATFORM: linux/amd64,linux/arm64/v8
- BASE_IMAGE: intel/oneapi-hpckit:2022.3.0-devel-ubuntu20.04
@@ -194,7 +197,7 @@ base:
jug_dev:default:
parallel:
matrix:
- - BASE_IMAGE: debian_testing_base
+ - BASE_IMAGE: debian_stable_base
BUILD_IMAGE: jug_dev
PLATFORM: linux/amd64,linux/arm64/v8
# - BASE_IMAGE: oneapi_base
diff --git a/containers/debian/base.Dockerfile b/containers/debian/base.Dockerfile
index 786cb0222..5b654e177 100644
--- a/containers/debian/base.Dockerfile
+++ b/containers/debian/base.Dockerfile
@@ -1,6 +1,6 @@
-#syntax=docker/dockerfile:1.2
-ARG BASE_IMAGE="amd64/debian:testing-20220822-slim"
-ARG BUILD_IMAGE="debian_base"
+#syntax=docker/dockerfile:1.4
+ARG BASE_IMAGE="amd64/debian:stable-slim"
+ARG BUILD_IMAGE="debian_stable_base"
# Minimal container based on Debian base systems for up-to-date packages.
FROM ${BASE_IMAGE}
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index 48a310244..bf2f61bec 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -1,6 +1,6 @@
#syntax=docker/dockerfile:1.4
ARG DOCKER_REGISTRY="eicweb"
-ARG BASE_IMAGE="debian_testing_base"
+ARG BASE_IMAGE="debian_stable_base"
ARG INTERNAL_TAG="testing"
## ========================================================================================
--
GitLab