From 6170dd3a17cb53f0be39f8c511fe66e9d9deced8 Mon Sep 17 00:00:00 2001 From: Kyo Sakuyo <59904064+KyoSakuyo@users.noreply.github.com> Date: Wed, 1 Feb 2023 20:08:33 +0800 Subject: [PATCH 01/21] Create docker-image.yml --- .github/workflows/docker-image.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 00000000..4a7dccbc --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,30 @@ +name: Docker Image CI + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + docker-build: + runs-on: ubuntu-latest + steps: + - name: Check out the repo + uses: actions/checkout@v3 + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - + name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Push to Docker Hub + uses: docker/build-push-action@v3 + with: + push: true + tags: kyosakuyo/flow:latest + platforms: linux/arm64 From c0a6b93b4ac2cd139969f23a15154ce8cfd2da26 Mon Sep 17 00:00:00 2001 From: Kyo Sakuyo <59904064+KyoSakuyo@users.noreply.github.com> Date: Wed, 1 Feb 2023 20:12:11 +0800 Subject: [PATCH 02/21] Update docker-image.yml --- .github/workflows/docker-image.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 4a7dccbc..dc4e7cd1 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -9,6 +9,7 @@ on: jobs: docker-build: runs-on: ubuntu-latest + steps: - name: Check out the repo uses: actions/checkout@v3 From f85413dfeb895aee3d97e19ade3d93f8ddc576df Mon Sep 17 00:00:00 2001 From: Kyo Sakuyo <59904064+KyoSakuyo@users.noreply.github.com> Date: Wed, 1 Feb 2023 20:16:50 +0800 Subject: [PATCH 03/21] Update docker-image.yml --- .github/workflows/docker-image.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index dc4e7cd1..7aec0384 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -13,10 +13,6 @@ jobs: steps: - name: Check out the repo uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - name: Login to DockerHub uses: docker/login-action@v2 @@ -28,4 +24,4 @@ jobs: with: push: true tags: kyosakuyo/flow:latest - platforms: linux/arm64 + platforms: linux/amd64 From 6a1a588a789cda15a1f9666c70a4fa6e793f446b Mon Sep 17 00:00:00 2001 From: Kyo Sakuyo <59904064+KyoSakuyo@users.noreply.github.com> Date: Wed, 1 Feb 2023 22:36:05 +0800 Subject: [PATCH 04/21] Update docker-image.yml --- .github/workflows/docker-image.yml | 49 +++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 7aec0384..6253625c 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,27 +1,46 @@ -name: Docker Image CI - +name: build & push docker container on: push: - branches: [ "main" ] + branches: + - main + tags: + - '*' pull_request: - branches: [ "main" ] - + branches: + - main jobs: - docker-build: + docker: runs-on: ubuntu-latest - + permissions: + contents: read + packages: write steps: - - name: Check out the repo + - name: Checkout uses: actions/checkout@v3 - - - name: Login to DockerHub + - name: Docker meta + id: metal + uses: docker/metadata-action@v4 + with: + images: | + ghcr.io/KyoSakuyo/flow + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Login to GitHub Container Registry + if: github.event_name != 'pull_request' uses: docker/login-action@v2 with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Push to Docker Hub + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Build and push uses: docker/build-push-action@v3 with: - push: true - tags: kyosakuyo/flow:latest + context: . platforms: linux/amd64 + push: ${{ github.event_name != 'pull_request' }} + tags: ${{ steps.metal.outputs.tags }} + labels: ${{ steps.metal.outputs.labels }} + cache-from: type=gha + cache-to: type=gha,mode=max From f91cb67f7d3f723b81eec1391e3e8ed19fea4ff6 Mon Sep 17 00:00:00 2001 From: Kyo Sakuyo <59904064+KyoSakuyo@users.noreply.github.com> Date: Wed, 1 Feb 2023 22:41:33 +0800 Subject: [PATCH 05/21] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2c51f9f9..afb74a93 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ COPY .gitignore .gitignore COPY --from=builder /app/out/json/ . COPY --from=builder /app/out/pnpm-*.yaml . RUN corepack enable -RUN pnpm i --frozen-lockfile +RUN pnpm i --use-store-server # Build the project COPY --from=builder /app/out/full/ . From bead148e04532ab0e7252224ae4e5cbb0708e2d4 Mon Sep 17 00:00:00 2001 From: Kyo Sakuyo <59904064+KyoSakuyo@users.noreply.github.com> Date: Wed, 1 Feb 2023 22:47:51 +0800 Subject: [PATCH 06/21] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index afb74a93..785eb6a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ COPY .gitignore .gitignore COPY --from=builder /app/out/json/ . COPY --from=builder /app/out/pnpm-*.yaml . RUN corepack enable -RUN pnpm i --use-store-server +RUN pnpm i --frozen-lockfile=false # Build the project COPY --from=builder /app/out/full/ . From 4bc5441ada5ddbb3e40c5b68fd74ec3c234034ed Mon Sep 17 00:00:00 2001 From: Kyo Sakuyo <59904064+KyoSakuyo@users.noreply.github.com> Date: Wed, 1 Feb 2023 22:50:50 +0800 Subject: [PATCH 07/21] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 785eb6a3..dbba9014 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ COPY .gitignore .gitignore COPY --from=builder /app/out/json/ . COPY --from=builder /app/out/pnpm-*.yaml . RUN corepack enable -RUN pnpm i --frozen-lockfile=false +RUN pnpm i # Build the project COPY --from=builder /app/out/full/ . From 488f3fdb9db5712f3b92f1ffbda8e93d1066620f Mon Sep 17 00:00:00 2001 From: Kyo Sakuyo <59904064+KyoSakuyo@users.noreply.github.com> Date: Wed, 1 Feb 2023 22:55:30 +0800 Subject: [PATCH 08/21] Update .npmrc --- .npmrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.npmrc b/.npmrc index 4e105640..6d47bddc 100644 --- a/.npmrc +++ b/.npmrc @@ -1,2 +1,4 @@ # https://github.com/remix-run/remix/issues/154#issuecomment-978359765 # shamefully-hoist=true +strict-peer-dependencies=false +auto-install-peers=true From 04f7bd85a0c44d3c928b63ecd16de8b8f7c687fb Mon Sep 17 00:00:00 2001 From: Kyo Sakuyo <59904064+KyoSakuyo@users.noreply.github.com> Date: Wed, 1 Feb 2023 22:56:12 +0800 Subject: [PATCH 09/21] Update .npmrc --- .npmrc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.npmrc b/.npmrc index 6d47bddc..10893972 100644 --- a/.npmrc +++ b/.npmrc @@ -1,4 +1,5 @@ -# https://github.com/remix-run/remix/issues/154#issuecomment-978359765 -# shamefully-hoist=true -strict-peer-dependencies=false auto-install-peers=true +shamefully-hoist=true +strict-peer-dependencies=false +shell-emulator=true +ignore-workspace-root-check=true From f9786b43c9790fd4354854eba2241a2d3e95f77f Mon Sep 17 00:00:00 2001 From: Kyo Sakuyo <59904064+KyoSakuyo@users.noreply.github.com> Date: Wed, 1 Feb 2023 22:56:52 +0800 Subject: [PATCH 10/21] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dbba9014..92fce281 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ COPY .gitignore .gitignore COPY --from=builder /app/out/json/ . COPY --from=builder /app/out/pnpm-*.yaml . RUN corepack enable -RUN pnpm i +RUN pnpm i --frozen-lockfile --ignore-scripts # Build the project COPY --from=builder /app/out/full/ . From 914d8bb30f4fad69ac124dac0b904a45ceb237b8 Mon Sep 17 00:00:00 2001 From: Kyo Sakuyo <59904064+KyoSakuyo@users.noreply.github.com> Date: Wed, 1 Feb 2023 22:59:54 +0800 Subject: [PATCH 11/21] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 92fce281..3c324645 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ COPY .gitignore .gitignore COPY --from=builder /app/out/json/ . COPY --from=builder /app/out/pnpm-*.yaml . RUN corepack enable -RUN pnpm i --frozen-lockfile --ignore-scripts +RUN pnpm install --no-frozen-lockfile # Build the project COPY --from=builder /app/out/full/ . From b617a3853e6aab1286b9e14d6888557b137885f9 Mon Sep 17 00:00:00 2001 From: Kyo Sakuyo <59904064+KyoSakuyo@users.noreply.github.com> Date: Wed, 1 Feb 2023 23:00:24 +0800 Subject: [PATCH 12/21] Update .npmrc --- .npmrc | 1 - 1 file changed, 1 deletion(-) diff --git a/.npmrc b/.npmrc index 10893972..e4a0f0b7 100644 --- a/.npmrc +++ b/.npmrc @@ -1,4 +1,3 @@ -auto-install-peers=true shamefully-hoist=true strict-peer-dependencies=false shell-emulator=true From 0841c7fd8635a918b736ee14ebef2d2d20671c61 Mon Sep 17 00:00:00 2001 From: Kyo Sakuyo <59904064+KyoSakuyo@users.noreply.github.com> Date: Wed, 1 Feb 2023 23:09:12 +0800 Subject: [PATCH 13/21] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3c324645..92fce281 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ COPY .gitignore .gitignore COPY --from=builder /app/out/json/ . COPY --from=builder /app/out/pnpm-*.yaml . RUN corepack enable -RUN pnpm install --no-frozen-lockfile +RUN pnpm i --frozen-lockfile --ignore-scripts # Build the project COPY --from=builder /app/out/full/ . From dc45d488e0c140d8bbdd39603c7bcd0167c3a229 Mon Sep 17 00:00:00 2001 From: Kyo Sakuyo <59904064+KyoSakuyo@users.noreply.github.com> Date: Wed, 1 Feb 2023 23:10:10 +0800 Subject: [PATCH 14/21] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 92fce281..3c324645 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ COPY .gitignore .gitignore COPY --from=builder /app/out/json/ . COPY --from=builder /app/out/pnpm-*.yaml . RUN corepack enable -RUN pnpm i --frozen-lockfile --ignore-scripts +RUN pnpm install --no-frozen-lockfile # Build the project COPY --from=builder /app/out/full/ . From 2f390056df55159e1355dcf271d1f0bef3deb6fa Mon Sep 17 00:00:00 2001 From: Kyo Sakuyo <59904064+KyoSakuyo@users.noreply.github.com> Date: Wed, 1 Feb 2023 23:11:10 +0800 Subject: [PATCH 15/21] Update docker-image.yml --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 6253625c..61a38058 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -38,7 +38,7 @@ jobs: uses: docker/build-push-action@v3 with: context: . - platforms: linux/amd64 + platforms: linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.metal.outputs.tags }} labels: ${{ steps.metal.outputs.labels }} From a46b0a59ed959b12672c63c350c38345df940dff Mon Sep 17 00:00:00 2001 From: Kyo Sakuyo <59904064+KyoSakuyo@users.noreply.github.com> Date: Wed, 1 Feb 2023 23:21:42 +0800 Subject: [PATCH 16/21] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 3c324645..54dcd3f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,7 @@ FROM node:16-alpine AS builder # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed. +RUN corepack prepare pnpm@7.26.3 --activate RUN apk add --no-cache libc6-compat RUN apk update # Set working directory From ee99a49c0536064e6d5a1d99782bc57730ae2982 Mon Sep 17 00:00:00 2001 From: Kyo Sakuyo <59904064+KyoSakuyo@users.noreply.github.com> Date: Thu, 2 Feb 2023 00:10:20 +0800 Subject: [PATCH 17/21] Update docker-image.yml --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 61a38058..e0c0a827 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -22,7 +22,7 @@ jobs: uses: docker/metadata-action@v4 with: images: | - ghcr.io/KyoSakuyo/flow + ghcr.io/${{ github.repository }} - name: Set up QEMU uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx From 165d94c05d468682922cf409a61cb92dded088b2 Mon Sep 17 00:00:00 2001 From: Kyo Sakuyo <59904064+KyoSakuyo@users.noreply.github.com> Date: Thu, 2 Feb 2023 00:10:39 +0800 Subject: [PATCH 18/21] Update docker-image.yml --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index e0c0a827..ec9d366a 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -38,7 +38,7 @@ jobs: uses: docker/build-push-action@v3 with: context: . - platforms: linux/arm64 + platforms: linux/amd64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.metal.outputs.tags }} labels: ${{ steps.metal.outputs.labels }} From 7b23abe267d8b1358cfe023bc31743f46ae94569 Mon Sep 17 00:00:00 2001 From: Kyo Sakuyo <59904064+KyoSakuyo@users.noreply.github.com> Date: Thu, 2 Feb 2023 02:15:17 +0800 Subject: [PATCH 19/21] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 54dcd3f6..781f3d9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,6 @@ FROM node:16-alpine AS builder # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed. -RUN corepack prepare pnpm@7.26.3 --activate RUN apk add --no-cache libc6-compat RUN apk update # Set working directory @@ -23,6 +22,8 @@ COPY .gitignore .gitignore COPY --from=builder /app/out/json/ . COPY --from=builder /app/out/pnpm-*.yaml . RUN corepack enable +RUN corepack prepare pnpm@7.26.3 --activate + RUN pnpm install --no-frozen-lockfile # Build the project From 093ef7d8170ef34072f7cfb7b48dddae55bc1dac Mon Sep 17 00:00:00 2001 From: Kyo Sakuyo <59904064+KyoSakuyo@users.noreply.github.com> Date: Thu, 2 Feb 2023 02:15:51 +0800 Subject: [PATCH 20/21] Update docker-image.yml --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index ec9d366a..e0c0a827 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -38,7 +38,7 @@ jobs: uses: docker/build-push-action@v3 with: context: . - platforms: linux/amd64 + platforms: linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.metal.outputs.tags }} labels: ${{ steps.metal.outputs.labels }} From 2e8de4e1d4c1e8bb9f7b9bab2d8e7b0177267c0f Mon Sep 17 00:00:00 2001 From: Kyo Sakuyo <59904064+KyoSakuyo@users.noreply.github.com> Date: Thu, 2 Feb 2023 15:41:08 +0800 Subject: [PATCH 21/21] Update docker-image.yml --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index e0c0a827..ec9d366a 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -38,7 +38,7 @@ jobs: uses: docker/build-push-action@v3 with: context: . - platforms: linux/arm64 + platforms: linux/amd64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.metal.outputs.tags }} labels: ${{ steps.metal.outputs.labels }}