diff --git a/.github/workflows/web_docker.yml b/.github/workflows/web_docker.yml index ff25334d..fa381c62 100644 --- a/.github/workflows/web_docker.yml +++ b/.github/workflows/web_docker.yml @@ -85,4 +85,4 @@ jobs: with: inputs: ${{ env.IMAGE_NAME }}:latest images: ${{ env.IMAGE_NAME }}:latest-linux-amd64,${{ env.IMAGE_NAME }}:latest-linux-arm64 - push: true \ No newline at end of file + push: true diff --git a/.github/workflows/web_docker_manual.yml b/.github/workflows/web_docker_manual.yml index 59c0df65..d362ef58 100644 --- a/.github/workflows/web_docker_manual.yml +++ b/.github/workflows/web_docker_manual.yml @@ -115,7 +115,7 @@ jobs: # Get architectures and create image list archs="${{ github.event.inputs.archs }}" IMAGE_LIST="" - + # Convert architectures to image tags IFS=',' read -ra ARCH_ARRAY <<< "$archs" for arch in "${ARCH_ARRAY[@]}"; do @@ -125,7 +125,7 @@ jobs: fi IMAGE_LIST="${IMAGE_LIST}${{ env.IMAGE_NAME }}:test-${{ env.IMAGE_TAG }}-${platform_pair}" done - + echo "image_list=${IMAGE_LIST}" >> $GITHUB_OUTPUT echo "latest_list=${IMAGE_LIST//test-${{ env.IMAGE_TAG }}/test-latest}" >> $GITHUB_OUTPUT @@ -141,4 +141,4 @@ jobs: with: inputs: ${{ env.IMAGE_NAME }}:test-latest images: ${{ steps.generate-manifest.outputs.latest_list }} - push: true \ No newline at end of file + push: true diff --git a/docker/Dockerfile b/docker/Dockerfile index fce3acc9..09cf5452 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,16 +5,14 @@ WORKDIR /app ARG VERSION=main -RUN npm install -g pnpm@10.9.0 +COPY . . +RUN corepack enable RUN pnpm install -COPY . . RUN sed -i 's|https://test.appflowy.cloud||g' src/components/main/app.hooks.ts RUN pnpm run build FROM nginx:alpine COPY --from=builder /app/dist /usr/share/nginx/html/ - -# Copy nginx.conf from docker folder -COPY docker/nginx.conf /etc/nginx/nginx.conf \ No newline at end of file +COPY --from=builder /app/docker/nginx.conf /etc/nginx/nginx.conf