From 9eb3255fdf240c67be647d037d987a9b6b991929 Mon Sep 17 00:00:00 2001 From: 4NK Dev Date: Sat, 20 Sep 2025 22:45:57 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20Correction=20des=20probl=C3=A8mes=20de?= =?UTF-8?q?=20PATH=20et=20SSH=20dans=20la=20CI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Ajout du PATH pour wasm-pack dans le workflow - Source de l'environnement Rust avant build_wasm - Remplacement SSH par HTTPS pour cloner sdk_client - Simplification du Dockerfile sans SSH - Suppression des étapes --mount=type=ssh - Toutes les dépendances accessibles via HTTPS --- .gitea/workflows/build-ext.yml | 12 ++++++++---- Dockerfile | 21 ++++++--------------- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/.gitea/workflows/build-ext.yml b/.gitea/workflows/build-ext.yml index ba6edc2..c7a473e 100644 --- a/.gitea/workflows/build-ext.yml +++ b/.gitea/workflows/build-ext.yml @@ -30,7 +30,9 @@ jobs: components: rustfmt, clippy - name: Install wasm-pack - run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh + run: | + curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh + echo "$HOME/.cargo/bin" >> $GITHUB_PATH - name: Setup SSH for git clone run: | @@ -41,10 +43,12 @@ jobs: - name: Clone sdk_client run: | - git clone -b dev git@git.4nkweb.com:4nk/sdk_client.git ../sdk_client + git clone -b dev https://git.4nkweb.com/4nk/sdk_client.git ../sdk_client - name: Build WebAssembly - run: npm run build_wasm + run: | + source $HOME/.cargo/env + npm run build_wasm - name: Build project run: npm run build @@ -67,7 +71,7 @@ jobs: DOCKER_BUILDKIT: "1" run: | set -euo pipefail - docker build --ssh default \ + docker build \ -t git.4nkweb.com/4nk/sdk_signer:ext \ -f Dockerfile . diff --git a/Dockerfile b/Dockerfile index ac8f953..92df75b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,6 @@ WORKDIR /build # Installation des dépendances nécessaires pour la compilation RUN apk update && apk add --no-cache \ git \ - openssh-client \ curl \ nodejs \ npm \ @@ -13,27 +12,20 @@ RUN apk update && apk add --no-cache \ pkgconfig \ clang \ llvm \ - musl-dev \ - nginx + musl-dev # Installation de wasm-pack RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh -# Configuration SSH basique -RUN mkdir -p /root/.ssh && \ - ssh-keyscan git.4nkweb.com >> /root/.ssh/known_hosts - -# On se place dans le bon répertoire parent -WORKDIR /build # Copie du projet sdk_signer COPY . sdk_signer/ -# Clonage du sdk_client au même niveau que sdk_signer en utilisant la clé SSH montée -RUN --mount=type=ssh git clone -b dev ssh://git@git.4nkweb.com/4nk/sdk_client.git +# Clonage du sdk_client au même niveau que sdk_signer +RUN git clone -b dev https://git.4nkweb.com/4nk/sdk_client.git -# Build du WebAssembly avec accès SSH pour les dépendances +# Build du WebAssembly WORKDIR /build/sdk_client -RUN --mount=type=ssh wasm-pack build --out-dir ../sdk_signer/pkg --target nodejs --dev +RUN wasm-pack build --out-dir ../sdk_signer/pkg --target nodejs --dev FROM node:20-alpine WORKDIR /app @@ -52,5 +44,4 @@ RUN npm run build EXPOSE 9090 -CMD ["npm", "start"] - +CMD ["npm", "start"] \ No newline at end of file