diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 518ee071db..d35456e100 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -87,9 +87,9 @@ docker-build: # GIT_STRATEGY: none image: hub.shanqu.cc/library/docker:latest script: - # - cp Dockerfile /Dockerfile + - cp Dockerfile /home/gitlab-runner/ci-build-cache/$CI_PROJECT_PATH/Dockerfile # - echo $PWD && ls -al - - docker build --build-arg CI_PROJECT_PATH=$CI_PROJECT_PATH -t registry.cn-shenzhen.aliyuncs.com/ghzs/base-gradle-cache:v5 -f $CI_PROJECT_DIR/Dockerfile /home/gitlab-runner/ci-build-cache + - docker build --build-arg CI_PROJECT_PATH=$CI_PROJECT_PATH -t registry.cn-shenzhen.aliyuncs.com/ghzs/base-gradle-cache:v5 -f /home/gitlab-runner/ci-build-cache/$CI_PROJECT_PATH/Dockerfile /home/gitlab-runner/ci-build-cache/$CI_PROJECT_PATH - docker push registry.cn-shenzhen.aliyuncs.com/ghzs/base-gradle-cache:v5 only: - feature-ci diff --git a/Dockerfile b/Dockerfile index d900abf79b..bd13a5a193 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,5 +14,5 @@ RUN sed -i "s@http://\(deb\|security\).debian.org@https://mirrors.aliyun.com@g" && apt-get --quiet install --yes wget lib32stdc++6 lib32z1 libncurses5 \ && rm -rf /var/lib/apt/lists/* -COPY ./$CI_PROJECT_PATH/.gradle /gradle-cache +COPY .gradle /gradle-cache CMD [ "/bin/bash", "-ce", "tail -f /dev/null" ]