update

- /dist.tgz
- /docker-entrypoint.sh
- /Dockerfile

.gitea/workflows/build.yml

@@ -0,0 +1,31 @@
+name: Build and Push Docker Image
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: "Docker tag"
+        required: true
+        default: "latest"
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: git.yoshino-s.xyz
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags: git.yoshino-s.xyz/${{ gitea.repository }}:${{ gitea.event.inputs.tag }}

.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: nightly
 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

.pre-commit-config.yaml

@@ -1,13 +0,0 @@
-repos:
-  - repo: https://github.com/python-poetry/poetry
-    rev: "1.5.1"
-    hooks:
-      - id: poetry-check
-      - id: poetry-lock
-      - id: poetry-export
-      - id: poetry-export
-        args: ["--with=dev", "-o", "requirements.dev.txt"]
-  - repo: https://github.com/pre-commit/mirrors-autopep8
-    rev: "v1.7.0"
-    hooks:
-      - id: autopep8

Dockerfile

@@ -1,12 +1,9 @@
 #first stage - builder
-FROM n8nio/n8n:latest
+FROM ghcr.io/n8n-io/n8n:latest
 
 USER root
 
 COPY inject.js /tmp
-COPY dist.tgz /tmp
-RUN cat /tmp/inject.js >> /usr/local/lib/node_modules/n8n/packages/cli/dist/License.js
-
-COPY docker-entrypoint.sh /
+RUN cat /tmp/inject.js >> /usr/local/lib/node_modules/n8n/dist/license.js
 
 USER node

docker-entrypoint.sh

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-mkdir -p ~/.n8n/nodes
-if [ -n "$NPM_PACKAGES" ]; then
-  cd ~/.n8n/nodes
-  npm install $NPM_PACKAGES
-  cd -
-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
-fi
-
-if [ "$#" -gt 0 ]; then
-  # Got started with arguments
-  exec n8n "$@"
-else
-  # Got started without arguments
-  exec n8n
-fi

inject.js

@@ -22,7 +22,7 @@ license_sdk_1.LicenseManager.prototype.licenseCert = {
       validFrom: new Date(),
       validTo: new Date(Date.now() + 1000 * 60 * 60 * 24 * 365),
       features: {
-        planName: "Hacky",
+        planName: "Enterprise",
         "feat:sharing": true,
         "feat:ldap": true,
         "feat:saml": true,
@@ -31,10 +31,23 @@ license_sdk_1.LicenseManager.prototype.licenseCert = {
         "feat:variables": true,
         "feat:debugInEditor": true,
         "feat:workflowHistory": true,
-        "feat:showNonProdBanner": true,
+        "feat:showNonProdBanner": false,
         "feat:externalSecrets": true,
-        "feat:apiDisabled": true,
+        "feat:apiDisabled": false,
         "feat:sourceControl": true,
+        "feat:binaryDataS3": true,
+        "feat:multipleMainInstances": true,
+        "feat:workerView": true,
+        "feat:advancedPermissions": true,
+        'feat:projectRole:admin': true,
+        'feat:projectRole:editor': true,
+        'feat:projectRole:viewer': true,
+        'feat:aiAssistant': true,
+        'feat:askAi': true,
+        'feat:communityNodes:customRegistry': true,
+        'feat:aiCredits': true,
+        'quota:aiCredits': 114514,
+        'quota:maxTeamProjects': 114514,
       },
     },
   ],