From 29f755dc2a3aff8b1f3135caaeb49279b764616d Mon Sep 17 00:00:00 2001
From: nikurasu <publicmail@nikurasu.gay>
Date: Thu, 28 Mar 2024 23:56:38 +0100
Subject: [PATCH] feat(devel-node): remove pnpm

remove pnpm because docker can't hard link in mounted dir
---
 .woodpecker.yml       | 5 ++---
 devel-node/Dockerfile | 4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 9421b26..7f0128a 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -23,10 +23,9 @@ steps:
       - apk add git jq curl
       - REGISTRY="dev.cat-enby.club"
       - NODE_LTS=$(curl -s https://nodejs.org/dist/index.json | jq -r '.[] | select(.lts) | .version' | head -n 1 | sed 's/v//')
-      - PNPM_VERSION=$(curl -s https://registry.npmjs.org/pnpm | jq -r '.["dist-tags"].latest')
-      - docker buildx build -t $${REGISTRY}/$CI_REPO_OWNER/devel-node:$${NODE_LTS}-$${PNPM_VERSION} -t $${REGISTRY}/$CI_REPO_OWNER/devel-node:latest -f ./devel-node/Dockerfile --build-arg NODE_VERSION=$${NODE_LTS} --build-arg PNPM_VERSION=$${PNPM_VERSION} .
+      - docker buildx build -t $${REGISTRY}/$CI_REPO_OWNER/devel-node:$${NODE_LTS} -t $${REGISTRY}/$CI_REPO_OWNER/devel-node:latest -f ./devel-node/Dockerfile --build-arg NODE_VERSION=$${NODE_LTS} --build-arg PNPM_VERSION=$${PNPM_VERSION} .
       - docker login --username $USER --password $PASS $${REGISTRY}
-      - docker push $${REGISTRY}/$CI_REPO_OWNER/devel-node:$${NODE_LTS}-$${PNPM_VERSION}
+      - docker push $${REGISTRY}/$CI_REPO_OWNER/devel-node:$${NODE_LTS}
       - docker push $${REGISTRY}/$CI_REPO_OWNER/devel-node:latest
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
diff --git a/devel-node/Dockerfile b/devel-node/Dockerfile
index 90e87b9..b51ac6b 100644
--- a/devel-node/Dockerfile
+++ b/devel-node/Dockerfile
@@ -1,9 +1,7 @@
 FROM dev.cat-enby.club/cat-enby-club/devel-base:latest
 ARG NODE_VERSION="20.12.0"
-ARG PNPM_VERSION="8.15.5"
 ARG USER="developer"
 RUN curl -fsSLO https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz &&\
     tar -xJf node-v$NODE_VERSION-linux-x64.tar.xz &&\
     for dir in lib share include bin;do cp -r node-v$NODE_VERSION-linux-x64/$dir /usr;done &&\
-    rm -r node-v$NODE_VERSION-linux-x64 node-v$NODE_VERSION-linux-x64.tar.xz &&\
-    runuser -l $USER -c 'curl -fsSL https://get.pnpm.io/install.sh | env SHELL=$(which bash) sh -'
\ No newline at end of file
+    rm -r node-v$NODE_VERSION-linux-x64 node-v$NODE_VERSION-linux-x64.tar.xz
\ No newline at end of file