Skip to content
Snippets Groups Projects
Commit 40bc8a87 authored by Thomas Schneider's avatar Thomas Schneider
Browse files

Remove stretch, make bullseye default everywhere

parent d14b9d40
No related branches found
No related tags found
No related merge requests found
...@@ -15,11 +15,6 @@ before_script: ...@@ -15,11 +15,6 @@ before_script:
script: script:
- /kaniko/executor --context $CI_PROJECT_DIR/$IMAGE_NAME --dockerfile $IMAGE_NAME/Dockerfile --build-arg DEBIAN_RELEASE=$DEBIAN_RELEASE --destination $CI_REGISTRY_IMAGE/$IMAGE_NAME:$DEBIAN_RELEASE-$CI_COMMIT_SHA --destination $CI_REGISTRY_IMAGE/$IMAGE_NAME:$DEBIAN_RELEASE - /kaniko/executor --context $CI_PROJECT_DIR/$IMAGE_NAME --dockerfile $IMAGE_NAME/Dockerfile --build-arg DEBIAN_RELEASE=$DEBIAN_RELEASE --destination $CI_REGISTRY_IMAGE/$IMAGE_NAME:$DEBIAN_RELEASE-$CI_COMMIT_SHA --destination $CI_REGISTRY_IMAGE/$IMAGE_NAME:$DEBIAN_RELEASE
.build-stretch:
extends: .build
variables:
DEBIAN_RELEASE: stretch
.build-buster: .build-buster:
extends: .build extends: .build
variables: variables:
...@@ -30,12 +25,6 @@ before_script: ...@@ -30,12 +25,6 @@ before_script:
variables: variables:
DEBIAN_RELEASE: bullseye DEBIAN_RELEASE: bullseye
base-stretch:
extends: .build-stretch
stage: base
variables:
IMAGE_NAME: fsmpi-base
base-buster: base-buster:
extends: .build-buster extends: .build-buster
stage: base stage: base
...@@ -60,12 +49,6 @@ latex-bullseye: ...@@ -60,12 +49,6 @@ latex-bullseye:
variables: variables:
IMAGE_NAME: fsmpi-latex IMAGE_NAME: fsmpi-latex
packages-stretch:
extends: .build-stretch
stage: first
variables:
IMAGE_NAME: fsmpi-packages
packages-buster: packages-buster:
extends: .build-buster extends: .build-buster
stage: first stage: first
...@@ -78,12 +61,6 @@ packages-bullseye: ...@@ -78,12 +61,6 @@ packages-bullseye:
variables: variables:
IMAGE_NAME: fsmpi-packages IMAGE_NAME: fsmpi-packages
python-stretch:
extends: .build-stretch
stage: first
variables:
IMAGE_NAME: fsmpi-python
python-buster: python-buster:
extends: .build-buster extends: .build-buster
stage: first stage: first
...@@ -108,12 +85,6 @@ ansible-bullseye: ...@@ -108,12 +85,6 @@ ansible-bullseye:
variables: variables:
IMAGE_NAME: fsmpi-ansible IMAGE_NAME: fsmpi-ansible
website-stretch:
extends: .build-stretch
stage: second
variables:
IMAGE_NAME: fsmpi-website
website-buster: website-buster:
extends: .build-buster extends: .build-buster
stage: second stage: second
......
ARG DEBIAN_RELEASE=stretch ARG DEBIAN_RELEASE=bullseye
FROM debian:${DEBIAN_RELEASE} FROM debian:${DEBIAN_RELEASE}
ARG DEBIAN_RELEASE ARG DEBIAN_RELEASE
ENV LANG C.UTF-8 ENV LANG C.UTF-8
......
deb http://ftp.halifax.rwth-aachen.de/debian stretch main
deb http://security.debian.org/debian-security stretch/updates main
deb http://ftp.halifax.rwth-aachen.de/debian stretch-updates main
ARG DEBIAN_RELEASE=stretch ARG DEBIAN_RELEASE=bullseye
FROM registry.git.fsmpi.rwth-aachen.de/infra/ci-containers/fsmpi-base:${DEBIAN_RELEASE} FROM registry.git.fsmpi.rwth-aachen.de/infra/ci-containers/fsmpi-base:${DEBIAN_RELEASE}
RUN apt-get update && apt-get install -y build-essential dpkg-dev quilt devscripts git curl && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install -y build-essential dpkg-dev quilt devscripts git curl && rm -rf /var/lib/apt/lists/*
ARG DEBIAN_RELEASE=stretch ARG DEBIAN_RELEASE=bullseye
FROM registry.git.fsmpi.rwth-aachen.de/infra/ci-containers/fsmpi-base:${DEBIAN_RELEASE} FROM registry.git.fsmpi.rwth-aachen.de/infra/ci-containers/fsmpi-base:${DEBIAN_RELEASE}
RUN apt-get update && apt-get install -y python3 python3-pip python3-venv flake8 curl && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install -y python3 python3-pip python3-venv flake8 curl && rm -rf /var/lib/apt/lists/*
ARG DEBIAN_RELEASE=stretch ARG DEBIAN_RELEASE=bullseye
FROM registry.git.fsmpi.rwth-aachen.de/infra/ci-containers/fsmpi-python:${DEBIAN_RELEASE} FROM registry.git.fsmpi.rwth-aachen.de/infra/ci-containers/fsmpi-python:${DEBIAN_RELEASE}
RUN apt-get update && apt-get install -y openssh-client rsync default-jre git && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install -y openssh-client rsync default-jre git && rm -rf /var/lib/apt/lists/*
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment