move to new registry

This commit is contained in:
Wolfgang Hottgenroth 2020-08-13 22:06:25 +02:00
parent baaaa11af6
commit 26ab025ebe
Signed by: wn
GPG Key ID: B586EAFCDF2F65F4
2 changed files with 11 additions and 8 deletions

View File

@ -1,10 +1,11 @@
image: docker:stable
image: registry.hottis.de/dockerized/docker-bash:latest
stages:
- build
variables:
IMAGE_NAME: registry.gitlab.com/wolutator/build-env-msp430
IMAGE_NAME: registry.hottis.de/dockerized/build-env-msp430
HUB_IMAGE_NAME: wollud1969/build-env-msp430
build:
stage: build
@ -15,8 +16,11 @@ build:
script:
- VERSION=`cat VERSION`
- echo "Version is $VERSION"
- docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$VERSION .
- docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$VERSION --tag $HUB_IMAGE_NAME:$VERSION --tag $HUB_IMAGE_NAME:latest .
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker push $IMAGE_NAME:latest
- docker push $IMAGE_NAME:$VERSION
- docker login -u $DOCKER_HUB_LOGIN -p $DOCKER_HUB_PASSWORD
- docker push $HUB_IMAGE_NAME:latest
- docker push $HUB_IMAGE_NAME:$VERSION

View File

@ -1,13 +1,12 @@
FROM registry.gitlab.com/wolutator/base-build-env:latest
FROM registry.hottis.de/dockerized/base-build-env:latest
LABEL Maintainer="Wolfgang Hottgenroth <woho@hottis.de>"
LABEL ImageName="registry.gitlab.com/wolutator/build-env-msp430"
LABEL ImageName="registry.hottis.de/dockerized/build-env-msp430"
LABEL AlternativeImageName="wollud1969/build-env-msp430"
RUN \
apt update && \
apt install -y msp430-libc && \
apt install -y binutils-msp430 && \
apt install -y gcc-msp430 && \
rm -rf /var/lib/apt/lists/*
apt install -y gcc-msp430