diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0dc386f51fcedb90d64a91973449e199344f8baf..055ba7e21f6486ec65017b3e2377ba04d1ff93d9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,7 +71,7 @@ stages: <<: *docker_variables stage: setup script: - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY/copasi/dune-copasi - docker build -f docker/dependencies.dockerfile --build-arg BASE_IMAGE=${DUNECI_BASE_IMAGE} -t ${CI_REGISTRY}/copasi/dune-copasi/dependencies/${DUNECI_OS}-${DUNECI_TOOLCHAIN}:latest . @@ -114,12 +114,12 @@ stages: <<: *docker_variables stage: deploy script: - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY/copasi/dune-copasi - docker build -f docker/dune-copasi.dockerfile --build-arg BASE_IMAGE=${DUNE_COPASI_BASE_IMAGE} --build-arg BRANCH=${CI_COMMIT_REF_NAME} - -t dune-copasi:${DUNECI_OS}-${DUNECI_TOOLCHAIN}-${CI_COMMIT_REF_NAME} . - - docker push dune-copasi:${DUNECI_OS}-${DUNECI_TOOLCHAIN}-${CI_COMMIT_REF_NAME} + -t $CI_REGISTRY/copasi/dune-copasi/dune-copasi/dune-copasi:${DUNECI_OS}-${DUNECI_TOOLCHAIN}-${CI_COMMIT_REF_NAME} . + - docker push $CI_REGISTRY/copasi/dune-copasi/dune-copasi/dune-copasi:${DUNECI_OS}-${DUNECI_TOOLCHAIN}-${CI_COMMIT_REF_NAME} - docker logout $CI_REGISTRY # only: # - master