Merge remote-tracking branch 'origin/main'

.gitlab-ci.yml

@@ -1,23 +1,33 @@
+# You can override the included template(s) by including variable overrides
+# SAST customization: https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings
+# Secret Detection customization: https://docs.gitlab.com/ee/user/application_security/secret_detection/#customizing-settings
+# Dependency Scanning customization: https://docs.gitlab.com/ee/user/application_security/dependency_scanning/#customizing-the-dependency-scanning-settings
+# Container Scanning customization: https://docs.gitlab.com/ee/user/application_security/container_scanning/#customizing-the-container-scanning-settings
+# Note that environment variables can be set in several places
+# See https://docs.gitlab.com/ee/ci/variables/#cicd-variable-precedence
 stages:
-  - release
-
+- release
+- test
 variables:
-  TAGS: ""
-
+  CI_APPLICATION_REPOSITORY: "$CI_REGISTRY_IMAGE"
+  CI_APPLICATION_TAG: ai-beta
 release-image:
   image: docker:24.0.6
   stage: release
   rules:
-    - if: '$TAGS'
+  - 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:
-    - if [ -z "$TAGS" ]; then export TAGS=$(cat tags.txt); fi
-    - |
-      for tag in $TAGS; do
-        export IMAGE_TAG=$CI_REGISTRY_IMAGE:$tag
-        echo $IMAGE_TAG
-        sed "s/latest/$tag/g" Dockerfile > Dockerfile.tmp
-        docker build . --pull -f Dockerfile.tmp -t $IMAGE_TAG
-        docker push $IMAGE_TAG
-      done
+  - |-
+    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
+    docker push $IMAGE_TAG
+container_scanning:
+  needs:
+  - release-image
+include:
+- template: Jobs/Container-Scanning.gitlab-ci.yml
+- template: Security/Secret-Detection.gitlab-ci.yml

docker-entrypoint.sh

@@ -8,10 +8,8 @@ if [ -n "$NPM_PACKAGES" ]; then
 fi
 
 if [ -n "$CUSTOM_UI" ]; then
-  # extract /tmp/dist.tgz to /usr/local/lib/node_modules/n8n/packages/dits
-  rm -rf /usr/local/lib/node_modules/n8n/packages/dits
-  tar -xzf /tmp/dist.tgz -C /usr/local/lib/node_modules/n8n/packages
-  rm /tmp/dist.tgz
+  rm -rf /usr/local/lib/node_modules/n8n/packages/editor-ui/dist
+  tar -xzf /tmp/dist.tgz -C /usr/local/lib/node_modules/n8n/packages/editor-ui
 fi
 
 if [ "$#" -gt 0 ]; then
@@ -20,4 +18,4 @@ if [ "$#" -gt 0 ]; then
 else
   # Got started without arguments
   exec n8n
-fi
+fi