4 Commits

Author SHA1 Message Date
a2bd559e19 fix for bullseye 2021-01-28 15:04:47 +01:00
a64be0c66a upgrade to bullseye 2021-01-28 14:52:12 +01:00
964ad65e27 add doxygen and procps 2021-01-28 14:51:01 +01:00
9eee846ef9 new gitlab release tool 2021-01-13 18:18:48 +01:00
2 changed files with 16 additions and 9 deletions

View File

@ -1,10 +1,10 @@
FROM debian:buster FROM debian:bullseye
LABEL Maintainer="Wolfgang Hottgenroth <woho@hottis.de>" LABEL Maintainer="Wolfgang Hottgenroth <woho@hottis.de>"
LABEL ImageName="registry.hottis.de/dockerized/base-build-env" LABEL ImageName="registry.hottis.de/dockerized/base-build-env"
LABEL AlternativeImageName="wollud1969/base-build-env" LABEL AlternativeImageName="wollud1969/base-build-env"
ARG RELEASETOOL_URL="https://home.hottis.de/gitlab/wolutator/gitlabreleaseuploader/uploads/f840b97a0eb64d1de2a6d6d1d4d1529e/GitlabReleaseTool.zip" ARG RELEASETOOL_URL="https://home.hottis.de/gitlab/wolutator/gitlabreleaseuploader/uploads/f97b219a1df1910822b9936a8236dfbd/GitlabReleaseTool.zip"
RUN \ RUN \
@ -12,12 +12,13 @@ RUN \
apt-get install -y make && \ apt-get install -y make && \
apt-get install -y openssh-client && \ apt-get install -y openssh-client && \
apt-get install -y git && \ apt-get install -y git && \
apt-get install -y python && \ apt-get install -y python3 && \
apt-get install -y python-requests && \ update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1 && \
apt-get install -y python-pycodestyle && \ apt-get install -y python3-requests && \
apt-get install -y python-yaml && \ apt-get install -y python3-pycodestyle && \
apt-get install -y python-pip && \ apt-get install -y python3-yaml && \
apt-get install -y python-xmltodict && \ apt-get install -y python3-pip && \
apt-get install -y python3-xmltodict && \
apt-get install -y gpg && \ apt-get install -y gpg && \
apt-get install -y apt-transport-https && \ apt-get install -y apt-transport-https && \
apt-get install -y wget && \ apt-get install -y wget && \
@ -26,6 +27,8 @@ RUN \
apt-get install -y zip && \ apt-get install -y zip && \
apt-get install -y vim.tiny && \ apt-get install -y vim.tiny && \
apt-get install -y p7zip-full && \ apt-get install -y p7zip-full && \
apt-get install -y procps && \
apt-get install -y doxygen && \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/* && \
cd /tmp && \ cd /tmp && \
wget $RELEASETOOL_URL && \ wget $RELEASETOOL_URL && \

View File

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