From bc9fa10b0685df97a9906b481884e453cefc0a6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?= =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?= =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?= Date: Tue, 3 Oct 2023 21:24:53 +0200 Subject: [PATCH] ci: Remove scheduled build for beta, and fix the inputs (no-changelog) --- .github/workflows/docker-image-beta.yml | 21 ++++++++++----------- docker/images/n8n-custom/Dockerfile | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docker-image-beta.yml b/.github/workflows/docker-image-beta.yml index 2050615862..ed99f6c009 100644 --- a/.github/workflows/docker-image-beta.yml +++ b/.github/workflows/docker-image-beta.yml @@ -1,17 +1,16 @@ name: Docker Image - Beta on: - schedule: - - cron: '0 2 * * *' workflow_dispatch: - branch: - description: 'Branch to create image off.' - required: true - default: 'ai-beta' - tag: - description: 'Name of the docker tag to create.' - required: true - default: 'ai-beta-nightly' + inputs: + branch: + description: 'Branch to create image off.' + required: true + default: 'ai-beta' + tag: + description: 'Name of the docker tag to create.' + required: true + default: 'ai-beta' jobs: build: @@ -20,7 +19,7 @@ jobs: - uses: actions/checkout@v3.5.3 with: fetch-depth: 0 - ref: ${{ github.event.inputs.branch || 'ai-tool-creation-breaking' }} + ref: ${{ github.event.inputs.branch || 'ai-beta' }} - uses: docker/setup-qemu-action@v2 - uses: docker/setup-buildx-action@v2 diff --git a/docker/images/n8n-custom/Dockerfile b/docker/images/n8n-custom/Dockerfile index 0d6f9e54d2..594fe47fce 100644 --- a/docker/images/n8n-custom/Dockerfile +++ b/docker/images/n8n-custom/Dockerfile @@ -1,5 +1,4 @@ ARG NODE_VERSION=18 -ARG N8N_RELEASE_TYPE=dev # 1. Create an image to build n8n FROM n8nio/base:${NODE_VERSION} as builder @@ -26,6 +25,7 @@ RUN rm -rf patches .npmrc *.yaml node_modules/.cache packages/**/node_modules/.c # 2. Start with a new clean image with just the code that is needed to run n8n FROM n8nio/base:${NODE_VERSION} +ARG N8N_RELEASE_TYPE=dev COPY --from=builder /home/node /usr/local/lib/node_modules/n8n RUN ln -s /usr/local/lib/node_modules/n8n/packages/cli/bin/n8n /usr/local/bin/n8n