From 3d8c7d5c1f1968990de61c359778416bf1fcbfb7 Mon Sep 17 00:00:00 2001 From: ewfian Date: Mon, 5 Jun 2023 21:32:02 +0900 Subject: [PATCH 1/7] CI: add docker build test --- .github/workflows/test_docker_build.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/test_docker_build.yml diff --git a/.github/workflows/test_docker_build.yml b/.github/workflows/test_docker_build.yml new file mode 100644 index 00000000000..b54063c6fa6 --- /dev/null +++ b/.github/workflows/test_docker_build.yml @@ -0,0 +1,22 @@ +name: Test Docker Build + +on: + push: + branches: + - master + + pull_request: + branches: + - "*" + +jobs: + build: + strategy: + matrix: + platform: [macos-latest, windows-latest, ubuntu-latest] + runs-on: ${{ matrix.platform }} + + steps: + - uses: actions/checkout@v3 + + - run: docker build --no-cache -t flowise . From 2cc6e054268824937b0258fe8c3cf070ec524f91 Mon Sep 17 00:00:00 2001 From: ewfian Date: Mon, 5 Jun 2023 21:34:43 +0900 Subject: [PATCH 2/7] fix branch name --- .github/workflows/main.yml | 2 +- .github/workflows/test_docker_build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a89846a6274..d087fb93d64 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ name: Node CI on: push: branches: - - master + - main pull_request: branches: diff --git a/.github/workflows/test_docker_build.yml b/.github/workflows/test_docker_build.yml index b54063c6fa6..4d824cea83c 100644 --- a/.github/workflows/test_docker_build.yml +++ b/.github/workflows/test_docker_build.yml @@ -3,7 +3,7 @@ name: Test Docker Build on: push: branches: - - master + - main pull_request: branches: From 1b8ca053802a361f0700bef625a9d8008fe4e689 Mon Sep 17 00:00:00 2001 From: ewfian Date: Mon, 5 Jun 2023 21:40:32 +0900 Subject: [PATCH 3/7] fix build failed --- .github/workflows/test_docker_build.yml | 1 + Dockerfile | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_docker_build.yml b/.github/workflows/test_docker_build.yml index 4d824cea83c..bde360986da 100644 --- a/.github/workflows/test_docker_build.yml +++ b/.github/workflows/test_docker_build.yml @@ -12,6 +12,7 @@ on: jobs: build: strategy: + fail-fast: false matrix: platform: [macos-latest, windows-latest, ubuntu-latest] runs-on: ${{ matrix.platform }} diff --git a/Dockerfile b/Dockerfile index 77eaa9d651f..5f70a30191f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,9 +9,10 @@ RUN apk add --update libc6-compat WORKDIR /usr/src/packages -# Copy root package.json and lockfile +# Copy root package.json COPY package.json ./ -COPY yarn.lock ./ +# Conditonal copy lockfile +COPY yarn.loc[k] ./ # Copy components package.json COPY packages/components/package.json ./packages/components/package.json From 7e8557fa5cfac5b967d9abab08d1d12670e22ca8 Mon Sep 17 00:00:00 2001 From: ewfian Date: Mon, 5 Jun 2023 21:48:41 +0900 Subject: [PATCH 4/7] fix build failed --- .github/workflows/test_docker_build.yml | 6 +----- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test_docker_build.yml b/.github/workflows/test_docker_build.yml index bde360986da..a698c2476b9 100644 --- a/.github/workflows/test_docker_build.yml +++ b/.github/workflows/test_docker_build.yml @@ -11,11 +11,7 @@ on: jobs: build: - strategy: - fail-fast: false - matrix: - platform: [macos-latest, windows-latest, ubuntu-latest] - runs-on: ${{ matrix.platform }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/Dockerfile b/Dockerfile index 5f70a30191f..76508b7d649 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ WORKDIR /usr/src/packages # Copy root package.json COPY package.json ./ # Conditonal copy lockfile -COPY yarn.loc[k] ./ +COPY ./yarn.loc[k] ./ # Copy components package.json COPY packages/components/package.json ./packages/components/package.json From 4e51f2a008fc87a39d5506ce1bb3f5e08f683d20 Mon Sep 17 00:00:00 2001 From: ewfian Date: Mon, 5 Jun 2023 21:50:33 +0900 Subject: [PATCH 5/7] fix build failed --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 76508b7d649..6ff3ef15fed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ WORKDIR /usr/src/packages # Copy root package.json COPY package.json ./ # Conditonal copy lockfile -COPY ./yarn.loc[k] ./ +COPY yarn.* ./ # Copy components package.json COPY packages/components/package.json ./packages/components/package.json From aa8996a98214d3c636c28034c61659d082b2f7cb Mon Sep 17 00:00:00 2001 From: ewfian Date: Mon, 5 Jun 2023 22:04:18 +0900 Subject: [PATCH 6/7] fix build failed --- Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6ff3ef15fed..3fc40769173 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,10 +9,8 @@ RUN apk add --update libc6-compat WORKDIR /usr/src/packages -# Copy root package.json -COPY package.json ./ -# Conditonal copy lockfile -COPY yarn.* ./ +# Copy root package.json and lockfile +COPY package.json yarn.loc[k] ./ # Copy components package.json COPY packages/components/package.json ./packages/components/package.json From 971de6b1edefb1c611fab2cc21fa78112d59a460 Mon Sep 17 00:00:00 2001 From: Henry Heng Date: Mon, 5 Jun 2023 21:18:40 +0100 Subject: [PATCH 7/7] Add python3 make g++ Issue - https://github.com/FlowiseAI/Flowise/issues/241 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3fc40769173..fc76cd00837 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ # docker run -d -p 3000:3000 flowise FROM node:18-alpine -RUN apk add --update libc6-compat +RUN apk add --update libc6-compat python3 make g++ WORKDIR /usr/src/packages