From 638cd6eb819b2fa46cf70c38c04b9c0f750d6a89 Mon Sep 17 00:00:00 2001 From: Nick Pakhodnia Date: Sat, 16 May 2026 09:37:18 -0400 Subject: [PATCH 1/4] fix Dockerfile after yarn.lock removed, use pnpm --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 670be12a9..2a53a1a07 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,9 +12,11 @@ RUN apk add g++ make python3 # You should overwrite this on the CLI with `-e NODE_ENV=production`. ENV NODE_ENV=local +RUN corepack enable + ## Utilize docker layer cache -COPY package.json yarn.lock /iframely/ -RUN yarn install --pure-lockfile --production +COPY package.json pnpm-lock.yaml pnpm-workspace.yaml /iframely/ +RUN pnpm install --frozen-lockfile --prod COPY . /iframely From b8f378fd82bee9a5d31fe3e573b1e87a19c5faea Mon Sep 17 00:00:00 2001 From: Nick Pakhodnia Date: Sat, 16 May 2026 09:38:36 -0400 Subject: [PATCH 2/4] check Docker image for fix branch as well --- .github/workflows/docker-image.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index e2b375041..a71e879d1 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - fix/docker_image_after_yarn_remove release: types: [published] From efe89d0736087e01ccfd40532478b5de7051a6b2 Mon Sep 17 00:00:00 2001 From: Nick Pakhodnia Date: Sat, 16 May 2026 09:44:20 -0400 Subject: [PATCH 3/4] bump github actions plugins versions to latest for docker-image.yml --- .github/workflows/docker-image.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index a71e879d1..982089f12 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -18,20 +18,20 @@ jobs: runs-on: ubuntu-latest steps: - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Login to Github Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ github.token }} - name: Generate Docker tags - uses: docker/metadata-action@v5 + uses: docker/metadata-action@v6 id: metadata with: images: ghcr.io/${{ github.repository }} @@ -41,7 +41,7 @@ jobs: latest=true - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v7 with: platforms: linux/amd64,linux/arm64 push: true From 8a6d598996b04cd466bd9a262ee39092ab0ded59 Mon Sep 17 00:00:00 2001 From: Nick Pakhodnia Date: Sat, 16 May 2026 10:02:32 -0400 Subject: [PATCH 4/4] Revert "check Docker image for fix branch as well" This reverts commit 8f20385ced73a7ac63134b1dc0ae39d0e7c51250. --- .github/workflows/docker-image.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 982089f12..4a05c32f3 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - fix/docker_image_after_yarn_remove release: types: [published]