From f27c743f719bb1468f977909ff3223d8541e7b83 Mon Sep 17 00:00:00 2001
From: yoshino-s <cy-cui@outlook.com>
Date: Fri, 24 Nov 2023 15:17:59 +0800
Subject: [PATCH 1/6] feat: direct build

---
 .gitlab-ci.yml | 47 ++++++++++++++++++++++++++++++++---------------
 gen.py         | 19 +------------------
 replace.py     | 14 --------------
 replace_oa.py  | 14 --------------
 4 files changed, 33 insertions(+), 61 deletions(-)
 delete mode 100644 replace.py
 delete mode 100644 replace_oa.py

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6405ffc..c97d29e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,28 +1,45 @@
 stages:
-- release
-- test
+  - release
+  - test
 variables:
   CI_APPLICATION_REPOSITORY: "$CI_REGISTRY_IMAGE"
-  REPLACE_OA: "true"
 release-image:
   image: docker:24.0.6
   stage: release
+  variables:
+    UPSTREAM_REPOSITORY: "https://github.com/windmill-labs/windmill.git"
+    UPSTREAM_REF: "main"
   rules:
-  - if: "$CI_APPLICATION_TAG"
+    - if: "$CI_APPLICATION_TAG"
   before_script:
-  - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-  - |-
-    export IMAGE_TAG=$CI_APPLICATION_REPOSITORY:$CI_APPLICATION_TAG
-    echo $IMAGE_TAG
-    sed "s/latest/$CI_APPLICATION_TAG/g" Dockerfile > Dockerfile.tmp
-    docker build . --pull -f Dockerfile.tmp -t $IMAGE_TAG --build-arg REPLACE_OA=$REPLACE_OA
-    docker push $IMAGE_TAG
+    - |- # fetch upstream
+      mkdir windmill && cd windmill
+      git init
+      git remote add origin $UPSTREAM_REPOSITORY
+      git fetch origin $UPSTREAM_REF
+      git checkout $UPSTREAM_REF
+    - |- # patch lic
+      export FILE=backend/windmill-api/src/ee.rs
+      export PREV_CONTENT=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDgVShzcLSPiOi+8ET8fggob1kmi47/cE12JaidPkwfGnScZItghkqtiLsct0U4kJhlp5gO89DYTBmIKadvxwY7kMsLlZzmi2emVH7c27cByGASY8QmWDNdG4Ggy/NDflGGBdAtN6gHawZAg4zHv3qpbPQGHH1/6sXIohcXhOnouwIDAQAB
+      export CURR_CONTENT=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYCk7qQIY6iPyXy+lkIV93prSpYt9b7WpKQFpMQR5QqPnnpyMzJnuOB6sbV7Mta5SISgrNGL5UoJmTI3cjUbijzHM9s0e99kCD5swdG9sPQnb5/bYbYR2lHYb5C9l3coBWuGCl9RdCXeERhLmZfVy/5Wyg0heO+Sb6RgyfqywlZQIDAQAB
+      sed -i "s|$PREV_CONTENT|$CURR_CONTENT|g" $FILE
+    - |- # patch openai api
+      export FILE=backend/windmill-api/src/openai.rs
+      export PREV_CONTENT=https://api.openai.com/v1
+      export CURR_CONTENT=https://oa.api2d.net/v1
+      sed -i "s|$PREV_CONTENT|$CURR_CONTENT|g" $FILE
+    - |-
+      export IMAGE_TAG=$CI_APPLICATION_REPOSITORY:$CI_APPLICATION_TAG
+      echo $IMAGE_TAG
+      docker build . -t $IMAGE_TAG --build-arg features=enterprise
+      docker push $IMAGE_TAG
 container_scanning:
   rules:
-  - if: "$CI_APPLICATION_TAG"
+    - if: "$CI_APPLICATION_TAG"
   needs:
-  - release-image
+    - release-image
 include:
-- template: Jobs/Container-Scanning.gitlab-ci.yml
-- template: Security/Secret-Detection.gitlab-ci.yml
\ No newline at end of file
+  - template: Jobs/Container-Scanning.gitlab-ci.yml
+  - template: Security/Secret-Detection.gitlab-ci.yml
diff --git a/gen.py b/gen.py
index 551265e..8003464 100644
--- a/gen.py
+++ b/gen.py
@@ -88,24 +88,7 @@ print(len(b64_public_key), len(PREV_KEY))
 
 assert len(b64_public_key) == len(PREV_KEY)
 
-REPLACE_TEMPLATE = f'''
-public_key = b"""{PREV_KEY}"""
-
-new_public_key = b"""{b64_public_key}"""
-
-from sys import argv
-
-with open(argv[1], "rb") as f:
-    data = f.read()
-
-assert public_key in data
-
-with open(argv[1], "wb") as f:
-    f.write(data.replace(public_key, new_public_key))
-'''
-
-with open("replace.py", "w") as f:
-    f.write(REPLACE_TEMPLATE)
+print("公钥:", b64_public_key)
 
 print("许可证密钥:", license_key)
 
diff --git a/replace.py b/replace.py
deleted file mode 100644
index 0ab2767..0000000
--- a/replace.py
+++ /dev/null
@@ -1,14 +0,0 @@
-
-public_key = b"""MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDgVShzcLSPiOi+8ET8fggob1kmi47/cE12JaidPkwfGnScZItghkqtiLsct0U4kJhlp5gO89DYTBmIKadvxwY7kMsLlZzmi2emVH7c27cByGASY8QmWDNdG4Ggy/NDflGGBdAtN6gHawZAg4zHv3qpbPQGHH1/6sXIohcXhOnouwIDAQAB"""
-
-new_public_key = b"""MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYCk7qQIY6iPyXy+lkIV93prSpYt9b7WpKQFpMQR5QqPnnpyMzJnuOB6sbV7Mta5SISgrNGL5UoJmTI3cjUbijzHM9s0e99kCD5swdG9sPQnb5/bYbYR2lHYb5C9l3coBWuGCl9RdCXeERhLmZfVy/5Wyg0heO+Sb6RgyfqywlZQIDAQAB"""
-
-from sys import argv
-
-with open(argv[1], "rb") as f:
-    data = f.read()
-
-assert public_key in data
-
-with open(argv[1], "wb") as f:
-    f.write(data.replace(public_key, new_public_key))
diff --git a/replace_oa.py b/replace_oa.py
deleted file mode 100644
index 42084f6..0000000
--- a/replace_oa.py
+++ /dev/null
@@ -1,14 +0,0 @@
-
-public_key =     b"""https://api.openai.com/v1"""
-
-new_public_key = b"""https:////oa.api2d.net/v1"""
-
-from sys import argv
-
-with open(argv[1], "rb") as f:
-    data = f.read()
-
-assert public_key in data
-
-with open(argv[1], "wb") as f:
-    f.write(data.replace(public_key, new_public_key))

From fccfcdf7452e4d3f877b62d4fea740adbdcee41a Mon Sep 17 00:00:00 2001
From: yoshino-s <cy-cui@outlook.com>
Date: Fri, 24 Nov 2023 15:21:18 +0800
Subject: [PATCH 2/6] update

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c97d29e..21dea3d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,16 +3,17 @@ stages:
   - test
 variables:
   CI_APPLICATION_REPOSITORY: "$CI_REGISTRY_IMAGE"
+  UPSTREAM_REPOSITORY: "https://github.com/windmill-labs/windmill.git"
+  UPSTREAM_REF: "main"
 release-image:
   image: docker:24.0.6
   stage: release
-  variables:
-    UPSTREAM_REPOSITORY: "https://github.com/windmill-labs/windmill.git"
-    UPSTREAM_REF: "main"
   rules:
     - if: "$CI_APPLICATION_TAG"
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+    # install git
+    - apk add --no-cache git
   script:
     - |- # fetch upstream
       mkdir windmill && cd windmill

From 3db6835d21682310f5608240cef59265a291139a Mon Sep 17 00:00:00 2001
From: yoshino-s <cy-cui@outlook.com>
Date: Fri, 24 Nov 2023 16:23:43 +0800
Subject: [PATCH 3/6] update

---
 .gitignore     | 2 ++
 .gitlab-ci.yml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index ad4a1f1..c95406b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -174,3 +174,5 @@ poetry.toml
 pyrightconfig.json
 
 # End of https://www.toptal.com/developers/gitignore/api/python
+
+windmill
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 21dea3d..593a212 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,7 @@ release-image:
     - |-
       export IMAGE_TAG=$CI_APPLICATION_REPOSITORY:$CI_APPLICATION_TAG
       echo $IMAGE_TAG
-      docker build . -t $IMAGE_TAG --build-arg features=enterprise
+      docker build . -t $IMAGE_TAG --build-arg features=enterprise --build-arg nsjail=true
       docker push $IMAGE_TAG
 container_scanning:
   rules:

From 8f9dd56f2f4aaba6e48a9211c8a87d389f1ef94a Mon Sep 17 00:00:00 2001
From: yoshino-s <cy-cui@outlook.com>
Date: Mon, 19 Aug 2024 11:01:35 +0000
Subject: [PATCH 4/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 593a212..240063f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,11 +16,7 @@ release-image:
     - apk add --no-cache git
   script:
     - |- # fetch upstream
-      mkdir windmill && cd windmill
-      git init
-      git remote add origin $UPSTREAM_REPOSITORY
-      git fetch origin $UPSTREAM_REF
-      git checkout $UPSTREAM_REF
+      git clone $UPSTREAM_REPOSITORY --depth 1 --branch $UPSTREAM_REF
     - |- # patch lic
       export FILE=backend/windmill-api/src/ee.rs
       export PREV_CONTENT=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDgVShzcLSPiOi+8ET8fggob1kmi47/cE12JaidPkwfGnScZItghkqtiLsct0U4kJhlp5gO89DYTBmIKadvxwY7kMsLlZzmi2emVH7c27cByGASY8QmWDNdG4Ggy/NDflGGBdAtN6gHawZAg4zHv3qpbPQGHH1/6sXIohcXhOnouwIDAQAB
@@ -43,4 +39,4 @@ container_scanning:
     - release-image
 include:
   - template: Jobs/Container-Scanning.gitlab-ci.yml
-  - template: Security/Secret-Detection.gitlab-ci.yml
+  - template: Security/Secret-Detection.gitlab-ci.yml
\ No newline at end of file

From a9cdd3922a65fee95080c7ae6b21a587304b11c3 Mon Sep 17 00:00:00 2001
From: yoshino-s <cy-cui@outlook.com>
Date: Mon, 19 Aug 2024 11:03:41 +0000
Subject: [PATCH 5/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 240063f..4476dba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,8 @@ release-image:
     - apk add --no-cache git
   script:
     - |- # fetch upstream
-      git clone $UPSTREAM_REPOSITORY --depth 1 --branch $UPSTREAM_REF
+      git clone $UPSTREAM_REPOSITORY --depth 1 --branch $UPSTREAM_REF windmill
+      cd windmill
     - |- # patch lic
       export FILE=backend/windmill-api/src/ee.rs
       export PREV_CONTENT=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDgVShzcLSPiOi+8ET8fggob1kmi47/cE12JaidPkwfGnScZItghkqtiLsct0U4kJhlp5gO89DYTBmIKadvxwY7kMsLlZzmi2emVH7c27cByGASY8QmWDNdG4Ggy/NDflGGBdAtN6gHawZAg4zHv3qpbPQGHH1/6sXIohcXhOnouwIDAQAB

From ece1e6ca5979291ff1785ff62dcdeff5d0367acc Mon Sep 17 00:00:00 2001
From: yoshino-s <cy-cui@outlook.com>
Date: Tue, 20 Aug 2024 03:19:05 +0000
Subject: [PATCH 6/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4476dba..8264c11 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,9 @@ release-image:
     - apk add --no-cache git
   script:
     - |- # fetch upstream
+      git config --global http.version HTTP/1.1
       git clone $UPSTREAM_REPOSITORY --depth 1 --branch $UPSTREAM_REF windmill
+      git config --global http.version HTTP/2
       cd windmill
     - |- # patch lic
       export FILE=backend/windmill-api/src/ee.rs