From c037a2ff91c0937c842f85f0e56d096a2d87f10c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E5=BD=AC?= <xiebin@96966.com>
Date: Mon, 20 Mar 2023 15:23:28 +0800
Subject: [PATCH] tar gradle-cache

---
 .gitlab-ci.yml | 19 +++++--------------
 Dockerfile     |  6 ++++--
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 177f23e2f4..8c3ba9b8ce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,16 +64,8 @@ android_build:
     - chmod +x ./gradlew
     - ./scripts/jenkins_build.sh -c
     - tar -cvf - /home/gitlab-runner/ci-build-cache/$CI_PROJECT_PATH/.gradle | xz -T 0 -c > gradle-cache.tar.xz
-    # - python3 /ci-android-mail.py
-    #   $Email_To_List
-    #   $Email_Title
-    #   $CI_PIPELINE_ID
-    #   $CI_COMMIT_BRANCH
-    #   "[$CI_COMMIT_AUTHOR] $CI_COMMIT_MESSAGE"
-    #   "$Apk_Path"
   artifacts:
     paths:
-      - Dockerfile
       - gradle-cache.tar.xz
   allow_failure:
     exit_codes: 137
@@ -85,14 +77,13 @@ docker-build:
   tags:
     - offline-test
   stage: docker-build
-  variables:
-    GIT_STRATEGY: none
+#   variables:
+#     GIT_STRATEGY: none
   image: hub.shanqu.cc/library/docker:latest
   script:
-    # - cp Dockerfile /home/gitlab-runner/ci-build-cache/$CI_PROJECT_PATH/Dockerfile
-    - echo $PWD && ls -al
-    - docker build -t registry.cn-shenzhen.aliyuncs.com/ghzs/base-gradle-cache:v5 .
-    - docker push registry.cn-shenzhen.aliyuncs.com/ghzs/base-gradle-cache:v5
+    - imageName=`echo $CI_PROJECT_PATH | sed 's#/#-#g'`
+    - docker build -t registry.cn-shenzhen.aliyuncs.com/ghzs/$imageName:latest .
+    - docker push registry.cn-shenzhen.aliyuncs.com/ghzs/$imageName:latest
   only:
     - feature-ci
 
diff --git a/Dockerfile b/Dockerfile
index 3331926e0f..f2a25f7ce5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM openjdk:11-jdk
-WORKDIR /usr/lib/sdk
+WORKDIR /project
 # ARG CI_PROJECT_PATH=default_value
 SHELL ["/bin/bash", "-c"]
 #配置SDK环境变量
@@ -7,6 +7,7 @@ ENV ANDROID_SDK_ROOT /usr/lib/sdk
 ENV ANDROID_HOME /usr/lib/sdk
 ENV PATH $ANDROID_SDK_ROOT:$PATH
 ENV PATH=$PATH:${ANDROID_HOME}/cmdline-tools/cmdline-tools/bin/
+ENV GRADLE_USER_HOME /project/.gradle
 
 RUN source ~/.bashrc
 RUN sed -i "s@http://\(deb\|security\).debian.org@https://mirrors.aliyun.com@g" /etc/apt/sources.list \
@@ -14,5 +15,6 @@ 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 gradle-cache.tar.xz /gradle-cache
+ADD . /project
+# RUN tar -Jxf gradle-cache.tar.xz
 CMD [ "/bin/bash", "-ce", "tail -f /dev/null" ]