From 6707f4d93a08c28f6acadba60d8a98b928a2fbe6 Mon Sep 17 00:00:00 2001 From: Tobias Klemp Date: Fri, 2 Jan 2026 01:42:59 +0100 Subject: [PATCH] meh, skip buildl --- .gitea/workflows/commentDeploy.yml | 17 +++++++++-------- Dockerfile | 11 ++++++++++- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/commentDeploy.yml b/.gitea/workflows/commentDeploy.yml index aadfd15..3d8c8e1 100644 --- a/.gitea/workflows/commentDeploy.yml +++ b/.gitea/workflows/commentDeploy.yml @@ -15,18 +15,19 @@ jobs: id: branch_name uses: ./.gitea/actions/getTagSafeRef - - name: Build and push image - id: docker_build - uses: ./.gitea/actions/build - with: - tag: ${{ steps.branch_name.outputs.branch_name }} - REGISTRY_ACCESS_TOKEN: ${{ secrets.REGISTRY_ACCESS_TOKEN }} - REGISTRY_USER: ${{ gitea.actor }} + # - name: Build and push image + # id: docker_build + # uses: ./.gitea/actions/build + # with: + # tag: ${{ steps.branch_name.outputs.branch_name }} + # REGISTRY_ACCESS_TOKEN: ${{ secrets.REGISTRY_ACCESS_TOKEN }} + # REGISTRY_USER: ${{ gitea.actor }} - name: Deploy application uses: ./.gitea/actions/deploy with: project_name: ${{ steps.branch_name.outputs.branch_name }} url: '${{ steps.branch_name.outputs.branch_name }}.phoenix.klemp.local' - image_url: ${{ steps.docker_build.outputs.image_url }} + # image_url: ${{ steps.docker_build.outputs.image_url }} + image_url: 'git.klemp.dev/tech-reborn/phoenix:feature-branch-deployments' deployment_key: ${{ secrets.SSH_DEPLOYMENT_KEY }} diff --git a/Dockerfile b/Dockerfile index 89d62af..54d117d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,14 @@ FROM oven/bun:1 AS base WORKDIR /usr/src/app +# install dependencies into temp directory +# this will cache them and speed up future builds FROM base AS install +RUN mkdir -p /temp/dev +COPY package.json bun.lock /temp/dev/ +RUN cd /temp/dev && bun install --frozen-lockfile + +# install with --production (exclude devDependencies) RUN mkdir -p /temp/prod COPY package.json bun.lock /temp/prod/ RUN cd /temp/prod && bun install --frozen-lockfile --production @@ -11,12 +18,14 @@ RUN cd /temp/prod && bun install --frozen-lockfile --production # copy node_modules from temp directory # then copy all (non-ignored) project files into the image FROM base AS prerelease -COPY --from=install /temp/prod/node_modules node_modules +COPY --from=install /temp/dev/node_modules node_modules COPY . . +# build ENV NODE_ENV=production RUN bun --bun run build +# copy production dependencies and source code into final image FROM base AS release COPY --from=install /temp/prod/node_modules node_modules COPY --from=prerelease /usr/src/app/build .