From e317867042828ce2383609ce4acbffcb4fd8068b Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Sun, 26 Jul 2020 13:23:56 +0200 Subject: [PATCH] move to local registry --- .gitlab-ci.yml | 8 ++++++-- Dockerfile | 7 ++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 496e187..50077b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,8 @@ stages: - build variables: - IMAGE_NAME: registry.gitlab.com/wolutator/build-env-arduino + IMAGE_NAME: registry.hottis.de/dockerized/build-env-arduino + HUB_IMAGE_NAME: wollud1969/build-env-arduino 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 $HUB_IMAGE_NAME:latest --tag $HUB_IMAGE_NAME:$VERSION --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$VERSION . - 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 191cd5c..05e4230 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,13 @@ FROM registry.gitlab.com/wolutator/base-build-env:latest LABEL Maintainer="Wolfgang Hottgenroth " -LABEL ImageName="registry.gitlab.com/wolutator/build-env-arduino" +LABEL ImageName="registry.hottis.de/dockerized/build-env-arduino" +LABEL HubImageName="wollud1969/build-env-arduino" ARG ArduinoDownloadUrl=https://github.com/arduino/arduino-cli/releases/download/0.5.0 ARG ArduinoPackage=arduino-cli_0.5.0_Linux_64bit.tar.gz -ARG ArduinoUID="2252" -ARG ArduinoGID="2252" +ARG ArduinoUID="1000" +ARG ArduinoGID="1000" ENV USER arduino RUN \