From fc28e2efd9e89629bffa976ffba963f72e0d9339 Mon Sep 17 00:00:00 2001 From: nick-delirium Date: Fri, 11 Oct 2024 16:35:14 +0200 Subject: [PATCH] workflows --- .github/workflows/frontend-dev.yaml | 2 +- .github/workflows/frontend.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/frontend-dev.yaml b/.github/workflows/frontend-dev.yaml index 57cfae2fd..6b3842433 100644 --- a/.github/workflows/frontend-dev.yaml +++ b/.github/workflows/frontend-dev.yaml @@ -61,7 +61,7 @@ jobs: set -x cd frontend mv .env.sample .env - docker run --rm -v /etc/passwd:/etc/passwd -u `id -u`:`id -g` -v $(pwd):/home/${USER} -w /home/${USER} --name node_build oven/bun:1.1.30-slim /bin/bash -c "npm i -g pnpm && pnpm i && bun run build" + docker run --rm -v /etc/passwd:/etc/passwd -u `id -u`:`id -g` -v $(pwd):/home/${USER} -w /home/${USER} --name node_build oven/bun:1.1.30-slim /bin/bash -c "wget -qO- https://get.pnpm.io/install.sh | ENV="$HOME/.bashrc" SHELL="$(which bash)" bash - && pnpm i && bun run build" # https://github.com/docker/cli/issues/1134#issuecomment-613516912 DOCKER_BUILDKIT=1 docker build --target=cicd -t $DOCKER_REPO/frontend:${IMAGE_TAG} . docker tag $DOCKER_REPO/frontend:${IMAGE_TAG} $DOCKER_REPO/frontend:${IMAGE_TAG}-ee diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml index c98b1b31b..c082082f2 100644 --- a/.github/workflows/frontend.yaml +++ b/.github/workflows/frontend.yaml @@ -65,7 +65,7 @@ jobs: set -x cd frontend mv .env.sample .env - docker run --rm -v /etc/passwd:/etc/passwd -u `id -u`:`id -g` -v $(pwd):/home/${USER} -w /home/${USER} --name node_build oven/bun:1.1.30-slim /bin/bash -c "npm i -g pnpm && pnpm i && bun run build" + docker run --rm -v /etc/passwd:/etc/passwd -u `id -u`:`id -g` -v $(pwd):/home/${USER} -w /home/${USER} --name node_build oven/bun:1.1.30-slim /bin/bash -c "wget -qO- https://get.pnpm.io/install.sh | ENV="$HOME/.bashrc" SHELL="$(which bash)" bash - && pnpm i && bun run build" # https://github.com/docker/cli/issues/1134#issuecomment-613516912 DOCKER_BUILDKIT=1 docker build --target=cicd -t $DOCKER_REPO/frontend:${IMAGE_TAG} . docker tag $DOCKER_REPO/frontend:${IMAGE_TAG} $DOCKER_REPO/frontend:${IMAGE_TAG}-ee