2 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
3 changed files with 13 additions and 34 deletions

View File

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

View File

@ -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"
@ -12,12 +12,13 @@ RUN \
apt-get install -y make && \
apt-get install -y openssh-client && \
apt-get install -y git && \
apt-get install -y python && \
apt-get install -y python-requests && \
apt-get install -y python-pycodestyle && \
apt-get install -y python-yaml && \
apt-get install -y python-pip && \
apt-get install -y python-xmltodict && \
apt-get install -y python3 && \
update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1 && \
apt-get install -y python3-requests && \
apt-get install -y python3-pycodestyle && \
apt-get install -y python3-yaml && \
apt-get install -y python3-pip && \
apt-get install -y python3-xmltodict && \
apt-get install -y gpg && \
apt-get install -y apt-transport-https && \
apt-get install -y wget && \

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