From 0dc3c3a4fae2f89d1e0a5ff52ed31e79a02217c6 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@murena.com>
Date: Wed, 8 Mar 2023 17:09:23 +0000
Subject: [PATCH 1/9] Add build tools to the path

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 6b20fea..aade1cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ ENV ANDROID_HOME "/sdk"
 ARG ANDROID_CMDLINE_TOOLS_BIN="${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin"
 
 # 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
 ARG JDK_VERSION=11
-- 
GitLab


From 5c2bc54ccf21610e47fb6da7e550dec632dca3f9 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@murena.com>
Date: Wed, 8 Mar 2023 17:21:00 +0000
Subject: [PATCH 2/9] Fix docker image publication

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b15d938..9a43586 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,6 @@ stages:
 
 variables:
   DOCKER_DRIVER: overlay2
-  CONTAINER_IMAGE: registry.gitlab.e.foundation:5000/$CI_PROJECT_PATH
 
 build_image:
   stage: build
@@ -12,7 +11,7 @@ build_image:
     - docker:18-dind
   script:
     - docker pull $CONTAINER_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_IMAGE
     - docker build --cache-from $CONTAINER_IMAGE:latest -t $CONTAINER_IMAGE -t $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME .
     - docker push $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME
     - if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker push $CONTAINER_IMAGE:latest ; fi
-- 
GitLab


From f993e0bc3d8d868802225fad6386ad668d1b8205 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@murena.com>
Date: Wed, 8 Mar 2023 17:25:35 +0000
Subject: [PATCH 3/9] Change another variable

---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a43586..97a1029 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,8 +10,8 @@ build_image:
   services:
     - docker:18-dind
   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 $CI_REGISTRY_IMAGE
-    - docker build --cache-from $CONTAINER_IMAGE:latest -t $CONTAINER_IMAGE -t $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME .
-    - docker push $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME
-    - if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker push $CONTAINER_IMAGE:latest ; fi
+    - docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME .
+    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
+    - if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker push $CI_REGISTRY_IMAGE:latest ; fi
-- 
GitLab


From 4abae1c8b24d658c5ad90b4097cf2399945e04ae Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@murena.com>
Date: Wed, 8 Mar 2023 17:29:17 +0000
Subject: [PATCH 4/9] test

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 97a1029..7bda4ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ build_image:
     - docker:18-dind
   script:
     - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME || true
-    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY_IMAGE
+    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
     - docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME .
     - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
     - if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker push $CI_REGISTRY_IMAGE:latest ; fi
-- 
GitLab


From 5baa3a3469f44a0a3d6be83c7d519fb0b82ac130 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@murena.com>
Date: Wed, 8 Mar 2023 17:37:23 +0000
Subject: [PATCH 5/9] explore

---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7bda4ee..31799be 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,8 +10,8 @@ build_image:
   services:
     - docker:18-dind
   script:
-    - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME || true
-    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
-    - docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME .
-    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
+    - "docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME || true"
+    - "docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY"
+    - "docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME ."
+    - "docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
     - if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker push $CI_REGISTRY_IMAGE:latest ; fi
-- 
GitLab


From 2cd6dbdf423c19ea7c92ade7b21b350a17372e2b Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@murena.com>
Date: Wed, 8 Mar 2023 17:41:39 +0000
Subject: [PATCH 6/9] show variable

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 31799be..ada4f05 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,7 @@ build_image:
   services:
     - docker:18-dind
   script:
+    - "echo $CI_COMMIT_REF_NAME"
     - "docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME || true"
     - "docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY"
     - "docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME ."
-- 
GitLab


From 14d36d6e67958df0d250b576a4b8d1c717aaa836 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@murena.com>
Date: Wed, 8 Mar 2023 17:47:13 +0000
Subject: [PATCH 7/9] show images

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ada4f05..ed9e53b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,5 +14,6 @@ build_image:
     - "docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME || true"
     - "docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY"
     - "docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME ."
+    - docker images
     - "docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
     - if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker push $CI_REGISTRY_IMAGE:latest ; fi
-- 
GitLab


From b655f16ee16d72cd3b968f2844eb9c79e8282c2e Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@murena.com>
Date: Wed, 8 Mar 2023 17:52:38 +0000
Subject: [PATCH 8/9] Update docker process

---
 .gitlab-ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed9e53b..ceee63d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,13 +2,14 @@ stages:
   - build
 
 variables:
-  DOCKER_DRIVER: overlay2
+  DOCKER_HOST: tcp://docker:2375
+  DOCKER_TLS_CERTDIR: ""
 
 build_image:
   stage: build
   image: docker:git
   services:
-    - docker:18-dind
+    - docker:20.10.16-dind
   script:
     - "echo $CI_COMMIT_REF_NAME"
     - "docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME || true"
-- 
GitLab


From d07bfa5aca2eac6f2f99d72d54dd86043432c46b Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@murena.com>
Date: Wed, 8 Mar 2023 17:58:17 +0000
Subject: [PATCH 9/9] clean

---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ceee63d..42406b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,10 +11,8 @@ build_image:
   services:
     - docker:20.10.16-dind
   script:
-    - "echo $CI_COMMIT_REF_NAME"
     - "docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME || true"
     - "docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY"
     - "docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME ."
-    - docker images
     - "docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
     - if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker push $CI_REGISTRY_IMAGE:latest ; fi
-- 
GitLab