From 9d88f32f6aa9bd5cf504a4cb322f74b474e8958d Mon Sep 17 00:00:00 2001 From: Izan Gil <66965250+SrIzan10@users.noreply.github.com> Date: Sat, 22 Mar 2025 17:47:33 +0100 Subject: [PATCH] ci: caching should work? --- .github/workflows/docker.yml | 3 +++ apps/web/Dockerfile | 7 +++---- package.json | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index bb24ebd..a6db441 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -38,6 +38,9 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} platforms: linux/amd64 + secrets: | + TURBO_TOKEN=${{ secrets.TURBO_TOKEN }} + TURBO_TEAM=${{ secrets.TURBO_TEAM }} - name: Emit a webhook to the server env: diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile index e89f9f7..5cc6bdb 100644 --- a/apps/web/Dockerfile +++ b/apps/web/Dockerfile @@ -1,5 +1,5 @@ FROM node:lts-alpine AS base - + FROM base AS builder RUN apk update RUN apk add --no-cache libc6-compat @@ -23,10 +23,9 @@ WORKDIR /app # First install the dependencies (as they change less often) COPY --from=builder /app/out/json/ . RUN yarn install --frozen-lockfile - -# Build the project + COPY --from=builder /app/out/full/ . -RUN yarn turbo run build +RUN --mount=type=secret,id=TURBO_TOKEN --mount=type=secret,id=TURBO_TEAM TURBO_TOKEN=$(cat /run/secrets/TURBO_TOKEN) TURBO_TEAM=$(cat /run/secrets/TURBO_TEAM) yarn turbo run build FROM base AS runner WORKDIR /app diff --git a/package.json b/package.json index f77d3bc..70aa097 100644 --- a/package.json +++ b/package.json @@ -8,10 +8,11 @@ "packages/*" ], "scripts": { - "build": "turbo run build", + "build": "dotenvx run -f .env.docker -- turbo run build", "dev": "turbo run dev", "lint": "turbo run lint", - "docker:web": "docker build -t srizan10/hclive -f apps/web/Dockerfile ." + "docker:web": "dotenvx run -f .env.docker -- docker buildx build --platform linux/amd64 -f apps/web/Dockerfile . --build-arg TURBO_TEAM=\"ducktors\" --secret id=TURBO_TOKEN,env=TURBO_TOKEN --secret id=TURBO_TEAM,env=TURBO_TEAM --no-cache", + "denv:install": "curl -fsS https://dotenvx.sh | sudo sh" }, "devDependencies": { "turbo": "^2.4.4"