From a06c386f066a0279a317e1c6663820d23bb51f1e Mon Sep 17 00:00:00 2001 From: luojiyin Date: Wed, 24 Jul 2024 20:35:41 +0800 Subject: [PATCH 01/32] build: slim-docker-github-action --- .github/workflows/deploy-production.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index 98f75c4..14a540c 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -37,12 +37,22 @@ jobs: with: context: . platforms: linux/amd64 - tags: ${{ env.BOX_URL }}:latest - outputs: type=docker,dest=${{ env.ARTIFACT_PATH }} + tags: + ${{ env.BOX_URL }}:latest + + # Slim the Docker image + - name: Slim Docker image + uses: kitabisa/docker-slim-action@v1 + env: + DSLIM_HTTP_PROBE: false + with: + target: ${{ env.BOX_URL }}:latest + tag: 'slim' - name: Pick Docker Compose run: | mkdir ./build + docker save ${{ env.BOX_URL }}:slim -o ${{ env.ARTIFACT_PATH }} mv ${{ env.ARTIFACT_PATH }} ./docker-compose.yml ./start.sh ./build - name: Transport Image From fc1918b97c1d44c4fb3c93abad02950a075b9f41 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Wed, 24 Jul 2024 20:59:27 +0800 Subject: [PATCH 02/32] try: change build-push-action version --- .github/workflows/deploy-production.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index 14a540c..6e8689c 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -33,7 +33,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - name: Build Image - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v4 with: context: . platforms: linux/amd64 From a1777f8b15dfd725502fb0d8f115b990fa0921d0 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Wed, 24 Jul 2024 21:08:43 +0800 Subject: [PATCH 03/32] set build action env --- .github/workflows/deploy-production.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index 6e8689c..3bfc7b2 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -34,6 +34,8 @@ jobs: - name: Build Image uses: docker/build-push-action@v4 + env: + load: true with: context: . platforms: linux/amd64 From b26b50eacbaf9c4d548bd06d2734c3e63555a8d3 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Wed, 24 Jul 2024 21:22:23 +0800 Subject: [PATCH 04/32] show docker images --- .github/workflows/deploy-production.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index 3bfc7b2..a9251d1 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -42,7 +42,11 @@ jobs: tags: ${{ env.BOX_URL }}:latest - # Slim the Docker image + - name: show docker image + run: | + docker images + + # Slim the Docker image - name: Slim Docker image uses: kitabisa/docker-slim-action@v1 env: From a55ba33b41d0b908469bced6ead90866640aee2e Mon Sep 17 00:00:00 2001 From: luojiyin Date: Wed, 24 Jul 2024 21:28:06 +0800 Subject: [PATCH 05/32] show docker images --- .github/workflows/deploy-production.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index a9251d1..7d7bb79 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -33,7 +33,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - name: Build Image - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v6 env: load: true with: From ba773dfb9bf7340bedc43fdde56b371e3b7bdb07 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Wed, 24 Jul 2024 21:37:26 +0800 Subject: [PATCH 06/32] show docker images --- .github/workflows/deploy-production.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index 7d7bb79..5931811 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -34,11 +34,10 @@ jobs: - name: Build Image uses: docker/build-push-action@v6 - env: - load: true with: context: . platforms: linux/amd64 + load: true tags: ${{ env.BOX_URL }}:latest From 112b8a6afe23efc5063cf6f613d52d70c782c3a9 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Wed, 24 Jul 2024 21:52:20 +0800 Subject: [PATCH 07/32] set chmod --- .github/workflows/deploy-production.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index 5931811..b6bff23 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -58,6 +58,7 @@ jobs: run: | mkdir ./build docker save ${{ env.BOX_URL }}:slim -o ${{ env.ARTIFACT_PATH }} + chmod 664 ${{ env.ARTIFACT_PATH }} mv ${{ env.ARTIFACT_PATH }} ./docker-compose.yml ./start.sh ./build - name: Transport Image From eeea8b875bc21a1ef6d3dffd6f2f3d20a95476ef Mon Sep 17 00:00:00 2001 From: luojiyin Date: Wed, 24 Jul 2024 22:09:00 +0800 Subject: [PATCH 08/32] fix: side effects --- start.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/start.sh b/start.sh index 6d20049..c6e4683 100644 --- a/start.sh +++ b/start.sh @@ -5,5 +5,3 @@ docker image ls -a docker-compose down -v docker-compose up -d - -docker image prune -a -f \ No newline at end of file From 12724b4efe99597bb5fc19bb6167c1740cfa9ea9 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Wed, 24 Jul 2024 22:15:48 +0800 Subject: [PATCH 09/32] build: use slim image --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5db4c62..a022169 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: oss-toolbox: - image: kaiyuanshe/oss-toolbox + image: kaiyuanshe/oss-toolbox:slim ports: - 3002:3000 healthcheck: From 240ab90da47e3e3587eb82af5ddfeea8431ffba2 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Wed, 24 Jul 2024 23:21:24 +0800 Subject: [PATCH 10/32] build: change dockerignore --- .dockerignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index a599e8b..de85ecc 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,7 +1,6 @@ README.md node_modules/ .eslintrc.json -.next/ .vercel/ start.sh .husky/ From 7c7180a6c7389a41b97864215e2a8e93222fd4c1 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Wed, 24 Jul 2024 23:27:57 +0800 Subject: [PATCH 11/32] build: change Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ec5863a..498039c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,4 +24,4 @@ COPY --from=prod-deps /app/node_modules ./node_modules COPY --from=build /app/public ./public COPY --from=build /app/.next ./.next EXPOSE 3000 -CMD ["npm", "start"] \ No newline at end of file +CMD ["npm","run", "start"] \ No newline at end of file From 5e9d73597e25c60416a8819b5644cbbcb63d2dd2 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Wed, 24 Jul 2024 23:44:45 +0800 Subject: [PATCH 12/32] set DSLIM_INCLUDE_APP_NEXT_DIR --- .dockerignore | 1 + .github/workflows/deploy-production.yml | 1 + Dockerfile | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index de85ecc..a599e8b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,6 +1,7 @@ README.md node_modules/ .eslintrc.json +.next/ .vercel/ start.sh .husky/ diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index b6bff23..92c6ddf 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -50,6 +50,7 @@ jobs: uses: kitabisa/docker-slim-action@v1 env: DSLIM_HTTP_PROBE: false + DSLIM_INCLUDE_APP_NEXT_DIR: true with: target: ${{ env.BOX_URL }}:latest tag: 'slim' diff --git a/Dockerfile b/Dockerfile index 498039c..148b601 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,4 +24,4 @@ COPY --from=prod-deps /app/node_modules ./node_modules COPY --from=build /app/public ./public COPY --from=build /app/.next ./.next EXPOSE 3000 -CMD ["npm","run", "start"] \ No newline at end of file +CMD ["npm","start"] \ No newline at end of file From 9574e8252d321654c1b798001ce0832cee134df7 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Wed, 24 Jul 2024 23:51:38 +0800 Subject: [PATCH 13/32] set next var --- .github/workflows/deploy-production.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index 92c6ddf..4156064 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -51,6 +51,10 @@ jobs: env: DSLIM_HTTP_PROBE: false DSLIM_INCLUDE_APP_NEXT_DIR: true + DSLIM_INCLUDE_APP_NEXT_BUILD_DIR: true + DSLIM_INCLUDE_APP_NEXT_DIST_DIR: true + DSLIM_INCLUDE_APP_NEXT_STATIC_DIR: true + DSLIM_INCLUDE_APP_NEXT_NM_DIR : true with: target: ${{ env.BOX_URL }}:latest tag: 'slim' From 2102c435698878813da62a2a85d455744e60dd64 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Sun, 28 Jul 2024 17:13:45 +0800 Subject: [PATCH 14/32] fix from review --- .github/workflows/deploy-production.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index 4156064..ba6e641 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -37,15 +37,13 @@ jobs: with: context: . platforms: linux/amd64 + tags: ${{ env.BOX_URL }}:latest load: true - tags: - ${{ env.BOX_URL }}:latest - name: show docker image - run: | + run: | docker images - # Slim the Docker image - name: Slim Docker image uses: kitabisa/docker-slim-action@v1 env: @@ -54,7 +52,7 @@ jobs: DSLIM_INCLUDE_APP_NEXT_BUILD_DIR: true DSLIM_INCLUDE_APP_NEXT_DIST_DIR: true DSLIM_INCLUDE_APP_NEXT_STATIC_DIR: true - DSLIM_INCLUDE_APP_NEXT_NM_DIR : true + DSLIM_INCLUDE_APP_NEXT_NM_DIR: true with: target: ${{ env.BOX_URL }}:latest tag: 'slim' From ed6154dc791546c4590b4790354b23d21553bac3 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Sun, 28 Jul 2024 17:17:33 +0800 Subject: [PATCH 15/32] fix from review --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 148b601..ec5863a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,4 +24,4 @@ COPY --from=prod-deps /app/node_modules ./node_modules COPY --from=build /app/public ./public COPY --from=build /app/.next ./.next EXPOSE 3000 -CMD ["npm","start"] \ No newline at end of file +CMD ["npm", "start"] \ No newline at end of file From 10186b7a65b994625fbaf8fc4b203b8daf26790a Mon Sep 17 00:00:00 2001 From: luojiyin Date: Sun, 28 Jul 2024 17:51:19 +0800 Subject: [PATCH 16/32] fix from review --- start.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/start.sh b/start.sh index c6e4683..6d20049 100644 --- a/start.sh +++ b/start.sh @@ -5,3 +5,5 @@ docker image ls -a docker-compose down -v docker-compose up -d + +docker image prune -a -f \ No newline at end of file From 1f2d647f50f88b31ad2fe390edfa2f0d9ad4b234 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Fri, 2 Aug 2024 20:16:50 +0800 Subject: [PATCH 17/32] use google distroless nodejs18 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ec5863a..4ec04a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,9 +19,9 @@ FROM base AS build RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm i --frozen-lockfile RUN pnpm build -FROM base +FROM gcr.io/distroless/nodejs18-debian12 COPY --from=prod-deps /app/node_modules ./node_modules COPY --from=build /app/public ./public COPY --from=build /app/.next ./.next EXPOSE 3000 -CMD ["npm", "start"] \ No newline at end of file +CMD ["./node_modules/next/dist/bin/next", "start"] \ No newline at end of file From 4930cb033f4b0e0ffbff68ba56b146a6e1e3e8d8 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Fri, 2 Aug 2024 20:35:08 +0800 Subject: [PATCH 18/32] inclue ./next --- .github/workflows/deploy-production.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index ba6e641..1be5895 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -53,6 +53,7 @@ jobs: DSLIM_INCLUDE_APP_NEXT_DIST_DIR: true DSLIM_INCLUDE_APP_NEXT_STATIC_DIR: true DSLIM_INCLUDE_APP_NEXT_NM_DIR: true + DSLIM_INCLUDE_PATH_FILE: './next' with: target: ${{ env.BOX_URL }}:latest tag: 'slim' From 3341f5aa30a47cbf2cbc551d0122f19b10654ad4 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Fri, 2 Aug 2024 20:40:08 +0800 Subject: [PATCH 19/32] inclue ./next --- .github/workflows/deploy-production.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index 1be5895..1e33373 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -53,7 +53,7 @@ jobs: DSLIM_INCLUDE_APP_NEXT_DIST_DIR: true DSLIM_INCLUDE_APP_NEXT_STATIC_DIR: true DSLIM_INCLUDE_APP_NEXT_NM_DIR: true - DSLIM_INCLUDE_PATH_FILE: './next' + DSLIM_INCLUDE_PATH: './next' with: target: ${{ env.BOX_URL }}:latest tag: 'slim' From 02e9ac928bdbd4f70a509939cddb8b3cab11060d Mon Sep 17 00:00:00 2001 From: luojiyin Date: Fri, 2 Aug 2024 20:41:35 +0800 Subject: [PATCH 20/32] inclue ./next --- .github/workflows/deploy-production.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index 1e33373..edbc05f 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -53,7 +53,7 @@ jobs: DSLIM_INCLUDE_APP_NEXT_DIST_DIR: true DSLIM_INCLUDE_APP_NEXT_STATIC_DIR: true DSLIM_INCLUDE_APP_NEXT_NM_DIR: true - DSLIM_INCLUDE_PATH: './next' + DSLIM_INCLUDE_PATH: '~/.next' with: target: ${{ env.BOX_URL }}:latest tag: 'slim' From 5bef0ac1711e850d3549089b87c507bf974a7fa2 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Fri, 2 Aug 2024 20:48:01 +0800 Subject: [PATCH 21/32] inclue /.next --- .github/workflows/deploy-production.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index edbc05f..60b1dc1 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -53,7 +53,7 @@ jobs: DSLIM_INCLUDE_APP_NEXT_DIST_DIR: true DSLIM_INCLUDE_APP_NEXT_STATIC_DIR: true DSLIM_INCLUDE_APP_NEXT_NM_DIR: true - DSLIM_INCLUDE_PATH: '~/.next' + DSLIM_INCLUDE_PATH: '/.next' with: target: ${{ env.BOX_URL }}:latest tag: 'slim' From 6fcfc64cd9c95791aebd59b3d298739aec3e6ab6 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Fri, 2 Aug 2024 20:57:39 +0800 Subject: [PATCH 22/32] inclue node_modules --- .github/workflows/deploy-production.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index 60b1dc1..b34511d 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -53,7 +53,7 @@ jobs: DSLIM_INCLUDE_APP_NEXT_DIST_DIR: true DSLIM_INCLUDE_APP_NEXT_STATIC_DIR: true DSLIM_INCLUDE_APP_NEXT_NM_DIR: true - DSLIM_INCLUDE_PATH: '/.next' + DSLIM_INCLUDE_PATH: '/.next /node_modules' with: target: ${{ env.BOX_URL }}:latest tag: 'slim' From c68799c9b383ba2d01f0cd111b6705cb6d04a974 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Fri, 2 Aug 2024 21:03:53 +0800 Subject: [PATCH 23/32] disable slim docker action --- .github/workflows/deploy-production.yml | 14 -------------- docker-compose.yml | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index b34511d..0c42558 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -44,20 +44,6 @@ jobs: run: | docker images - - name: Slim Docker image - uses: kitabisa/docker-slim-action@v1 - env: - DSLIM_HTTP_PROBE: false - DSLIM_INCLUDE_APP_NEXT_DIR: true - DSLIM_INCLUDE_APP_NEXT_BUILD_DIR: true - DSLIM_INCLUDE_APP_NEXT_DIST_DIR: true - DSLIM_INCLUDE_APP_NEXT_STATIC_DIR: true - DSLIM_INCLUDE_APP_NEXT_NM_DIR: true - DSLIM_INCLUDE_PATH: '/.next /node_modules' - with: - target: ${{ env.BOX_URL }}:latest - tag: 'slim' - - name: Pick Docker Compose run: | mkdir ./build diff --git a/docker-compose.yml b/docker-compose.yml index a022169..5db4c62 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: oss-toolbox: - image: kaiyuanshe/oss-toolbox:slim + image: kaiyuanshe/oss-toolbox ports: - 3002:3000 healthcheck: From 82fff62ca36e27a076e3ef741d9a68fcae50430c Mon Sep 17 00:00:00 2001 From: luojiyin Date: Fri, 2 Aug 2024 21:09:15 +0800 Subject: [PATCH 24/32] remove slim --- .github/workflows/deploy-production.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index 0c42558..0902352 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -47,7 +47,7 @@ jobs: - name: Pick Docker Compose run: | mkdir ./build - docker save ${{ env.BOX_URL }}:slim -o ${{ env.ARTIFACT_PATH }} + docker save ${{ env.BOX_URL }} -o ${{ env.ARTIFACT_PATH }} chmod 664 ${{ env.ARTIFACT_PATH }} mv ${{ env.ARTIFACT_PATH }} ./docker-compose.yml ./start.sh ./build From d316c24ceac805870b9b22b5aae51d98c586b25e Mon Sep 17 00:00:00 2001 From: luojiyin Date: Fri, 2 Aug 2024 23:13:37 +0800 Subject: [PATCH 25/32] use standalone --- Dockerfile | 11 ++++------- next.config.mjs | 1 + 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4ec04a2..b5ab0a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,16 +12,13 @@ RUN corepack enable COPY . /app WORKDIR /app -FROM base AS prod-deps -RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm i -P --frozen-lockfile --ignore-scripts - FROM base AS build RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm i --frozen-lockfile RUN pnpm build FROM gcr.io/distroless/nodejs18-debian12 -COPY --from=prod-deps /app/node_modules ./node_modules -COPY --from=build /app/public ./public -COPY --from=build /app/.next ./.next + +COPY --from=build /app/.next/standalone ./ +COPY --from=build /app/.next/static ./.next/static EXPOSE 3000 -CMD ["./node_modules/next/dist/bin/next", "start"] \ No newline at end of file +CMD ["server.js"] \ No newline at end of file diff --git a/next.config.mjs b/next.config.mjs index 3f4269d..78d3e36 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -30,6 +30,7 @@ const withPWA = setPWA({ const nextConfig = withPWA( withLess( withMDX({ + output: 'standalone' , pageExtensions: ['ts', 'tsx', 'js', 'jsx', 'md', 'mdx'], webpack: config => { From 14b8d1467e3637bb82ba3af0dff187991188d81e Mon Sep 17 00:00:00 2001 From: luojiyin Date: Fri, 2 Aug 2024 23:31:15 +0800 Subject: [PATCH 26/32] use base image --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b5ab0a9..5210fd5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,9 +16,10 @@ FROM base AS build RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm i --frozen-lockfile RUN pnpm build -FROM gcr.io/distroless/nodejs18-debian12 +FROM base COPY --from=build /app/.next/standalone ./ +COPY --from=build /app/public ./public COPY --from=build /app/.next/static ./.next/static EXPOSE 3000 CMD ["server.js"] \ No newline at end of file From e8acd42970385825e3a31e7d204efe19b97c7587 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Fri, 2 Aug 2024 23:56:27 +0800 Subject: [PATCH 27/32] code clear --- next.config.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/next.config.mjs b/next.config.mjs index 78d3e36..81c56f8 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -30,7 +30,7 @@ const withPWA = setPWA({ const nextConfig = withPWA( withLess( withMDX({ - output: 'standalone' , + output: 'standalone', pageExtensions: ['ts', 'tsx', 'js', 'jsx', 'md', 'mdx'], webpack: config => { From d5111affc242edef291f1e5d24f6579866ac6529 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Fri, 2 Aug 2024 23:59:30 +0800 Subject: [PATCH 28/32] code clear --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5210fd5..c92a457 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,6 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm i --frozen-lockfile RUN pnpm build FROM base - COPY --from=build /app/.next/standalone ./ COPY --from=build /app/public ./public COPY --from=build /app/.next/static ./.next/static From 9932dc3ecaeb9a8ee1e041ba0412eee32347715a Mon Sep 17 00:00:00 2001 From: luojiyin Date: Sat, 3 Aug 2024 08:17:14 +0800 Subject: [PATCH 29/32] restore action --- .github/workflows/deploy-production.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index 0902352..98f75c4 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -38,17 +38,11 @@ jobs: context: . platforms: linux/amd64 tags: ${{ env.BOX_URL }}:latest - load: true - - - name: show docker image - run: | - docker images + outputs: type=docker,dest=${{ env.ARTIFACT_PATH }} - name: Pick Docker Compose run: | mkdir ./build - docker save ${{ env.BOX_URL }} -o ${{ env.ARTIFACT_PATH }} - chmod 664 ${{ env.ARTIFACT_PATH }} mv ${{ env.ARTIFACT_PATH }} ./docker-compose.yml ./start.sh ./build - name: Transport Image From e90e904b63fd1c8d91485f3cba72d15d04d8dca4 Mon Sep 17 00:00:00 2001 From: luojiyin Date: Sat, 3 Aug 2024 18:16:49 +0800 Subject: [PATCH 30/32] set env to solve unhealthy --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c92a457..35c7ba9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,4 +21,6 @@ COPY --from=build /app/.next/standalone ./ COPY --from=build /app/public ./public COPY --from=build /app/.next/static ./.next/static EXPOSE 3000 -CMD ["server.js"] \ No newline at end of file +ENV PORT 3000 +ENV HOSTNAME="0.0.0.0" +CMD ["node", "server.js"] \ No newline at end of file From cf192c2d4a6f9f9428af38d8bb444d30d0c74ee1 Mon Sep 17 00:00:00 2001 From: South Drifted Date: Sat, 3 Aug 2024 21:45:33 +0800 Subject: [PATCH 31/32] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 35c7ba9..6531ff6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ FROM base AS build RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm i --frozen-lockfile RUN pnpm build -FROM base +FROM base COPY --from=build /app/.next/standalone ./ COPY --from=build /app/public ./public COPY --from=build /app/.next/static ./.next/static From 668b872d2e8b64ff1fa33faa63c4f5a2e062ddfb Mon Sep 17 00:00:00 2001 From: South Drifted Date: Sat, 3 Aug 2024 21:46:41 +0800 Subject: [PATCH 32/32] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6531ff6..7d56991 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,6 @@ COPY --from=build /app/.next/standalone ./ COPY --from=build /app/public ./public COPY --from=build /app/.next/static ./.next/static EXPOSE 3000 -ENV PORT 3000 +ENV PORT=3000 ENV HOSTNAME="0.0.0.0" CMD ["node", "server.js"] \ No newline at end of file