From 7cce73ec820fa3f4b65f789659696040c5d7d36a Mon Sep 17 00:00:00 2001
From: Matic Lubej <matic.lubej@sinergise.com>
Date: Fri, 26 Apr 2024 11:38:53 +0200
Subject: [PATCH 1/4] move docker file to be more aligned with the rest of the
 repos

---
 {.gitlab/docker => docker}/Dockerfile | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {.gitlab/docker => docker}/Dockerfile (100%)

diff --git a/.gitlab/docker/Dockerfile b/docker/Dockerfile
similarity index 100%
rename from .gitlab/docker/Dockerfile
rename to docker/Dockerfile

From b10ec81af06671f660fab8ffc6328b1d2617bf3b Mon Sep 17 00:00:00 2001
From: Matic Lubej <matic.lubej@sinergise.com>
Date: Fri, 26 Apr 2024 11:39:34 +0200
Subject: [PATCH 2/4] mirror action update

---
 .github/workflows/ci_action.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci_action.yml b/.github/workflows/ci_action.yml
index 2617d7b8..ca6a4315 100644
--- a/.github/workflows/ci_action.yml
+++ b/.github/workflows/ci_action.yml
@@ -123,11 +123,11 @@ jobs:
       - name: Mirror + trigger CI
         uses: SvanBoxel/gitlab-mirror-and-ci-action@master
         with:
-          args: "https://git.sinergise.com/eo/code/sentinelhub-py-dev/"
+          args: "https://hello.planet.com/code/eo/code/sentinelhub-py-dev/"
         env:
           FOLLOW_TAGS: "true"
-          GITLAB_HOSTNAME: "git.sinergise.com"
+          GITLAB_HOSTNAME: "hello.planet.com/code"
           GITLAB_USERNAME: "github-action"
           GITLAB_PASSWORD: ${{ secrets.GITLAB_PASSWORD }}
-          GITLAB_PROJECT_ID: "354"
+          GITLAB_PROJECT_ID: "9711"
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 27647caf4e30ac6012f72844f9eb651147fd98fe Mon Sep 17 00:00:00 2001
From: Matic Lubej <matic.lubej@sinergise.com>
Date: Fri, 26 Apr 2024 11:39:44 +0200
Subject: [PATCH 3/4] update docker build action

---
 .github/workflows/ci_trigger.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci_trigger.yml b/.github/workflows/ci_trigger.yml
index 5bdd9419..3fc327e9 100644
--- a/.github/workflows/ci_trigger.yml
+++ b/.github/workflows/ci_trigger.yml
@@ -16,4 +16,4 @@ jobs:
             -F ref=main \
             -F variables[CUSTOM_RUN_TAG]=auto \
             -F variables[LAYER_NAME]=dotai-eo \
-            https://git.sinergise.com/api/v4/projects/1031/trigger/pipeline
+            https://hello.planet.com/code/api/v4/projects/9723/trigger/pipeline

From 98cae3017a28640c69408a88b6834a841a3ca866 Mon Sep 17 00:00:00 2001
From: Matic Lubej <matic.lubej@sinergise.com>
Date: Fri, 26 Apr 2024 11:40:31 +0200
Subject: [PATCH 4/4] changes to gitlab yaml file, docker login updates, other
 simplifications

---
 .gitlab-ci.yml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 87226e29..be1d6c5b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,10 @@
+default:
+  tags:
+    - sinergise-lju
+
+variables:
+  BASE_IMAGE: $CI_REGISTRY_IMAGE/python-3.9-base:latest
+
 stages:
   - update
   - test
@@ -6,20 +13,21 @@ update_base_image:
   stage: update
   image: docker:latest
   rules:
-    - if: '$UPDATE_BASE_IMAGE == "true"'
+    - if: $UPDATE_BASE_IMAGE == "true"
+
   script:
-    - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY"
-    - docker build --file=".gitlab/docker/Dockerfile" --tag="$BASE_IMAGE" .
-    - docker push "$BASE_IMAGE"
+    - echo $CI_JOB_TOKEN | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin
+    - docker build -f docker/Dockerfile -t $BASE_IMAGE .
+    - docker push $BASE_IMAGE
 
 run_sh_integration_tests:
   stage: test
-  image: "$BASE_IMAGE"
+  image: $BASE_IMAGE
   dependencies: []
   needs: []
   rules:
     - when: always
-      if: '$UPDATE_BASE_IMAGE != "true"'
+      if: $UPDATE_BASE_IMAGE != "true"
   script:
     - pip install -e .[AWS,DEV]
     - pytest -m "sh_integration"