diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index c1c4dd1..b7d32d6 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -30,12 +30,6 @@ jobs: username: ${{ secrets.USER }} password: ${{ secrets.TOKEN }} - - name: Prepare Config - id: prep - run: | - ESCAPED_CONF=$(echo '${{ secrets.CONF }}' | sed 's/"/\\"/g') - echo "conf=$ESCAPED_CONF" >> $GITHUB_OUTPUT - - name: Build and push uses: docker/build-push-action@v5 with: @@ -43,7 +37,7 @@ jobs: push: true ssh: default build-args: | - CONF=${{ steps.prep.outputs.conf }} + CONF=${{ secrets.CONF }} tags: | ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ gitea.sha }} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 95eba4e..8644997 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,10 +7,11 @@ RUN mkdir -p /root/.ssh && \ ssh-keyscan git.4nkweb.com >> /root/.ssh/known_hosts # Copie des fichiers de sdk_relay -COPY Cargo.toml Cargo.lock ./ -COPY src src/ +COPY sdk_relay/Cargo.toml sdk_relay/Cargo.lock sdk_relay/ +COPY sdk_relay/src sdk_relay/src/ # Build avec support SSH pour récupérer les dépendances +WORKDIR /app/sdk_relay RUN --mount=type=ssh cargo build --release # ---- image finale ---- @@ -20,26 +21,24 @@ RUN apt-get update && apt-get install -y ca-certificates strace # Créer l'utilisateur bitcoin RUN useradd -m -d /home/bitcoin -u 1000 bitcoin -COPY --from=builder /app/target/release/sdk_relay /usr/local/bin/sdk_relay +COPY --from=builder /app/sdk_relay/target/release/sdk_relay /usr/local/bin/sdk_relay # Configuration via build arg ARG CONF -RUN printf '%s\n' "$CONF" > /home/bitcoin/.conf && \ - chown bitcoin:bitcoin /home/bitcoin/.conf && \ - cat /home/bitcoin/.conf +RUN echo "$CONF" > /home/bitcoin/.conf && \ + chown bitcoin:bitcoin /home/bitcoin/.conf -# Créer le répertoire .4nk avec les bonnes permissions et le dossier logs -RUN mkdir -p /home/bitcoin/.4nk/logs && \ +# Créer le répertoire .4nk avec les bonnes permissions +RUN mkdir -p /home/bitcoin/.4nk && \ chown -R bitcoin:bitcoin /home/bitcoin/.4nk && \ chmod 755 /home/bitcoin/.4nk WORKDIR /home/bitcoin USER bitcoin ENV HOME=/home/bitcoin -ENV RUST_LOG=DEBUG VOLUME ["/home/bitcoin/.4nk"] VOLUME ["/home/bitcoin/.bitcoin"] EXPOSE 8090 8091 -ENTRYPOINT ["/bin/sh", "-c", "exec sdk_relay --config .conf 2>&1 | tee -a $HOME/.4nk/logs/sdk_relay.log"] \ No newline at end of file +ENTRYPOINT ["sdk_relay", "--config", ".conf"] \ No newline at end of file