Loading .gitlab-ci.yml +8 −8 Original line number Original line Diff line number Diff line Loading @@ -2,17 +2,17 @@ stages: - build - build variables: variables: DOCKER_DRIVER: overlay2 DOCKER_HOST: tcp://docker:2375 CONTAINER_IMAGE: registry.gitlab.e.foundation:5000/$CI_PROJECT_PATH DOCKER_TLS_CERTDIR: "" build_image: build_image: stage: build stage: build image: docker:git image: docker:git services: services: - docker:18-dind - docker:20.10.16-dind script: script: - docker pull $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME || true - "docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME || true" - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.e.foundation:5000 - "docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY" - docker build --cache-from $CONTAINER_IMAGE:latest -t $CONTAINER_IMAGE -t $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME . - "docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME ." - docker push $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME - "docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" - if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker push $CONTAINER_IMAGE:latest ; fi - if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker push $CI_REGISTRY_IMAGE:latest ; fi Dockerfile +1 −1 Original line number Original line Diff line number Diff line Loading @@ -13,7 +13,7 @@ ENV ANDROID_HOME "/sdk" ARG ANDROID_CMDLINE_TOOLS_BIN="${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin" ARG ANDROID_CMDLINE_TOOLS_BIN="${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin" # Add Gradle and SDK tools to the PATH # Add Gradle and SDK tools to the PATH ENV PATH "$PATH:${ANDROID_CMDLINE_TOOLS_BIN}/:${GRADLE_PATH}/:${ANDROID_HOME}/emulator/:${ANDROID_HOME}/platform-tools/" ENV PATH "$PATH:${ANDROID_CMDLINE_TOOLS_BIN}/:${GRADLE_PATH}/:${ANDROID_HOME}/emulator/:${ANDROID_HOME}/platform-tools/:${ANDROID_HOME}/build-tools/31.0.0/" # Setup distribution and install required distribution packages # Setup distribution and install required distribution packages ARG JDK_VERSION=11 ARG JDK_VERSION=11 Loading Loading
.gitlab-ci.yml +8 −8 Original line number Original line Diff line number Diff line Loading @@ -2,17 +2,17 @@ stages: - build - build variables: variables: DOCKER_DRIVER: overlay2 DOCKER_HOST: tcp://docker:2375 CONTAINER_IMAGE: registry.gitlab.e.foundation:5000/$CI_PROJECT_PATH DOCKER_TLS_CERTDIR: "" build_image: build_image: stage: build stage: build image: docker:git image: docker:git services: services: - docker:18-dind - docker:20.10.16-dind script: script: - docker pull $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME || true - "docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME || true" - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.e.foundation:5000 - "docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY" - docker build --cache-from $CONTAINER_IMAGE:latest -t $CONTAINER_IMAGE -t $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME . - "docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME ." - docker push $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME - "docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" - if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker push $CONTAINER_IMAGE:latest ; fi - if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker push $CI_REGISTRY_IMAGE:latest ; fi
Dockerfile +1 −1 Original line number Original line Diff line number Diff line Loading @@ -13,7 +13,7 @@ ENV ANDROID_HOME "/sdk" ARG ANDROID_CMDLINE_TOOLS_BIN="${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin" ARG ANDROID_CMDLINE_TOOLS_BIN="${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin" # Add Gradle and SDK tools to the PATH # Add Gradle and SDK tools to the PATH ENV PATH "$PATH:${ANDROID_CMDLINE_TOOLS_BIN}/:${GRADLE_PATH}/:${ANDROID_HOME}/emulator/:${ANDROID_HOME}/platform-tools/" ENV PATH "$PATH:${ANDROID_CMDLINE_TOOLS_BIN}/:${GRADLE_PATH}/:${ANDROID_HOME}/emulator/:${ANDROID_HOME}/platform-tools/:${ANDROID_HOME}/build-tools/31.0.0/" # Setup distribution and install required distribution packages # Setup distribution and install required distribution packages ARG JDK_VERSION=11 ARG JDK_VERSION=11 Loading