diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 498597fb11be8c431a8efee24d4e08749af44af1..fb40b0561c68182d46df27f613a43bf5e5bd5f4f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,11 +35,11 @@ build-my-base: -build-my-r-base: +build-my-rbase: stage: build needs: [build-my-base] variables: - STAGE_NAME: "my-r-base" + STAGE_NAME: "my-rbase" script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY # pull the previous stage @@ -68,13 +68,13 @@ build-my-r-base: build-my-r-shiny: stage: build - needs: ["build-my-r-base"] + needs: ["build-my-rbase"] variables: STAGE_NAME: "my-r-shiny" script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY # pull the previous stage - - docker pull "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/my-r-base/${R_VERSION}:$CI_COMMIT_SHA" + - docker pull "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/my-rbase/${R_VERSION}:$CI_COMMIT_SHA" # put both versions in a env var, to be used as tag - | if [ "latest" == "${R_VERSION}" ]; then diff --git a/Dockerfile b/Dockerfile index b04e38b0509dc4bd06e22902e6174499577cd67c..533147a539786df959cebaae9385cee57d0b02e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,7 @@ COPY ./scripts /opt/scripts ########################################################### # R image ########################################################### -FROM my-base as my-r-base +FROM my-base as my-rbase ARG R_VERSION=latest #install R, along with its dependencies