Compare commits
2 Commits
1.5.2-bull
...
5fa49204dc
Author | SHA1 | Date | |
---|---|---|---|
5fa49204dc
|
|||
14ebc02a0c |
@ -1,9 +1,8 @@
|
|||||||
FROM debian:bullseye
|
FROM debian:buster
|
||||||
|
|
||||||
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"
|
||||||
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"
|
ARG RELEASETOOL_URL="https://home.hottis.de/gitlab/wolutator/gitlabreleaseuploader/uploads/f97b219a1df1910822b9936a8236dfbd/GitlabReleaseTool.zip"
|
||||||
|
|
||||||
@ -16,7 +15,6 @@ RUN \
|
|||||||
apt install -y openssh-client && \
|
apt install -y openssh-client && \
|
||||||
apt install -y git && \
|
apt install -y git && \
|
||||||
apt install -y python3 && \
|
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-requests && \
|
||||||
apt install -y python3-pycodestyle && \
|
apt install -y python3-pycodestyle && \
|
||||||
apt install -y python3-yaml && \
|
apt install -y python3-yaml && \
|
||||||
@ -28,12 +26,14 @@ RUN \
|
|||||||
apt install -y curl && \
|
apt install -y curl && \
|
||||||
apt install -y unzip && \
|
apt install -y unzip && \
|
||||||
apt install -y zip && \
|
apt install -y zip && \
|
||||||
apt install -y vim-tiny && \
|
apt install -y vim.tiny && \
|
||||||
apt install -y p7zip-full && \
|
apt install -y p7zip-full && \
|
||||||
apt install -y procps && \
|
apt install -y procps && \
|
||||||
apt install -y doxygen && \
|
apt install -y doxygen && \
|
||||||
apt install -y jq && \
|
apt install -y jq && \
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
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 && \
|
pip install Cheetah3 && \
|
||||||
cd /tmp && \
|
cd /tmp && \
|
||||||
wget $RELEASETOOL_URL && \
|
wget $RELEASETOOL_URL && \
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
## Base image for build containers
|
## Base image for build containers
|
||||||
|
|
||||||
Based on Debian ~~Buster~~ Bullseye
|
Based on Debian Buster
|
||||||
|
|
||||||
Contains additionally:
|
Contains additionally:
|
||||||
* make
|
* make
|
||||||
@ -12,9 +12,7 @@ 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
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user