move to local registry

This commit is contained in:
2020-07-26 13:23:56 +02:00
parent 3d8660cfa6
commit e317867042
2 changed files with 10 additions and 5 deletions

View File

@ -4,7 +4,8 @@ stages:
- build - build
variables: 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: build:
stage: build stage: build
@ -15,8 +16,11 @@ build:
script: script:
- VERSION=`cat VERSION` - VERSION=`cat VERSION`
- echo "Version is $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 login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker push $IMAGE_NAME:latest - docker push $IMAGE_NAME:latest
- docker push $IMAGE_NAME:$VERSION - 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,12 +1,13 @@
FROM registry.gitlab.com/wolutator/base-build-env:latest FROM registry.gitlab.com/wolutator/base-build-env:latest
LABEL Maintainer="Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>" LABEL Maintainer="Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>"
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 ArduinoDownloadUrl=https://github.com/arduino/arduino-cli/releases/download/0.5.0
ARG ArduinoPackage=arduino-cli_0.5.0_Linux_64bit.tar.gz ARG ArduinoPackage=arduino-cli_0.5.0_Linux_64bit.tar.gz
ARG ArduinoUID="2252" ARG ArduinoUID="1000"
ARG ArduinoGID="2252" ARG ArduinoGID="1000"
ENV USER arduino ENV USER arduino
RUN \ RUN \