From 26ab025ebe41f4496078c60c626a9ff7d109c16a Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Thu, 13 Aug 2020 22:06:25 +0200 Subject: [PATCH] move to new registry --- .gitlab-ci.yml | 10 +++++++--- Dockerfile | 9 ++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2db5f59..4168dee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/Dockerfile b/Dockerfile index b7cf393..9a3caad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 " -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