feat: direct build

.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
+  - template: Jobs/Container-Scanning.gitlab-ci.yml
+  - template: Security/Secret-Detection.gitlab-ci.yml

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)
 

replace.py

@@ -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))

replace_oa.py

@@ -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))