fix for bullseye

.gitlab-ci.yml

@@ -2,29 +2,3 @@ include:
         - project: dockerized/commons
           ref: master
           file: gitlab-ci-template.yml
-
-stages:
-        - check
-        - build
-        - krohnify
-
-variables:
-        NEXUS_REGISTRY: devnexus.krohne.com:18079/repository/docker-krohne
-        NEXUS_IMAGE_NAME: $NEXUS_REGISTRY/$CI_PROJECT_NAME
-
-krohnify:
-        image: registry.hottis.de/dockerized/docker-bash:latest
-        stage: krohnify
-        tags:
-                - krohne
-                - linux
-                - docker
-        only:
-                - tags
-        script:
-                - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-                - docker pull $IMAGE_NAME:${CI_COMMIT_TAG} 
-                - docker tag $IMAGE_NAME:${CI_COMMIT_TAG} $NEXUS_IMAGE_NAME:${CI_COMMIT_TAG}
-                - docker login $NEXUS_REGISTRY --username $NEXUS_USER --password $NEXUS_PASSWORD
-                - docker push $NEXUS_IMAGE_NAME:${CI_COMMIT_TAG}
-

Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:buster
+FROM debian:bullseye
 
 LABEL Maintainer="Wolfgang Hottgenroth <woho@hottis.de>"
 LABEL ImageName="registry.hottis.de/dockerized/base-build-env"
@@ -8,33 +8,28 @@ ARG RELEASETOOL_URL="https://home.hottis.de/gitlab/wolutator/gitlabreleaseupload
 
 
 RUN \
-  apt update && \
+  apt-get update && \
-  apt upgrade -y && \
+  apt-get install -y make && \
-  apt install -y ca-certificates && \
+  apt-get install -y openssh-client && \
-  apt install -y make && \
+  apt-get install -y git && \
-  apt install -y openssh-client && \
+  apt-get install -y python3 && \
-  apt install -y git && \
+  update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1 && \
-  apt install -y python3 && \
+  apt-get install -y python3-requests && \
-  apt install -y python3-requests && \
+  apt-get install -y python3-pycodestyle && \
-  apt install -y python3-pycodestyle && \
+  apt-get install -y python3-yaml && \
-  apt install -y python3-yaml && \
+  apt-get install -y python3-pip && \
-  apt install -y python3-pip && \
+  apt-get install -y python3-xmltodict && \
-  apt install -y python3-xmltodict && \
+  apt-get install -y gpg && \
-  apt install -y gpg && \
+  apt-get install -y apt-transport-https && \
-  apt install -y apt-transport-https && \
+  apt-get install -y wget && \
-  apt install -y wget && \
+  apt-get install -y curl && \
-  apt install -y curl && \
+  apt-get install -y unzip && \
-  apt install -y unzip && \
+  apt-get install -y zip && \
-  apt install -y zip && \
+  apt-get install -y vim.tiny && \
-  apt install -y vim.tiny && \
+  apt-get install -y p7zip-full && \
-  apt install -y p7zip-full && \
+  apt-get install -y procps && \
-  apt install -y procps && \
+  apt-get install -y doxygen && \
-  apt install -y doxygen && \
-  apt install -y jq && \
   rm -rf /var/lib/apt/lists/* && \
-  ln -s /usr/bin/python3 /usr/bin/python && \
-  ln -s /usr/bin/pip3 /usr/bin/pip && \
-  pip install Cheetah3 && \
   cd /tmp && \
   wget $RELEASETOOL_URL && \
   unzip GitlabReleaseTool.zip && \
@@ -44,4 +39,3 @@ RUN \
   mv gitlabreleaseuploader.py /usr/bin && \
   mv deleterelease.py /usr/bin && \
   mv checksemver.py /usr/bin
-

readme.md

@@ -1,6 +1,6 @@
 ## Base image for build containers
 
-Based on Debian Buster
+Based on Debian ~~Buster~~ Bullseye
 
 Contains additionally:
    * make
@@ -12,5 +12,9 @@ Contains additionally:
    * wget and curl
    * zip, unzip and 7z
    * vim.tiny
+   * ps
+   * doxygen
    * GitLab release tool: https://home.hottis.de/gitlab/wolutator/gitlabreleaseuploader including validator for semantic version according to https://semver.org/
 
+Switched to Python 3
+