Compare commits

...

11 Commits

2 changed files with 9 additions and 5 deletions

View File

@ -1,8 +1,9 @@
FROM debian:buster
FROM debian:bullseye
LABEL Maintainer="Wolfgang Hottgenroth <woho@hottis.de>"
LABEL ImageName="registry.hottis.de/dockerized/base-build-env"
LABEL AlternativeImageName="wollud1969/base-build-env"
LABEL NexusImageName="devnexus.krohne.com:18079/repository/docker-krohne/base-build-env"
ARG RELEASETOOL_URL="https://home.hottis.de/gitlab/wolutator/gitlabreleaseuploader/uploads/f97b219a1df1910822b9936a8236dfbd/GitlabReleaseTool.zip"
@ -15,6 +16,7 @@ RUN \
apt install -y openssh-client && \
apt install -y git && \
apt install -y python3 && \
update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1 && \
apt install -y python3-requests && \
apt install -y python3-pycodestyle && \
apt install -y python3-yaml && \
@ -26,14 +28,12 @@ RUN \
apt install -y curl && \
apt install -y unzip && \
apt install -y zip && \
apt install -y vim.tiny && \
apt install -y vim-tiny && \
apt install -y p7zip-full && \
apt install -y procps && \
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 && \

View File

@ -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