From bd93b021db49b03e2745544d549882bda21a104a Mon Sep 17 00:00:00 2001 From: OCram85 Date: Fri, 5 Apr 2024 08:15:11 +0200 Subject: [PATCH] fix starship prompt installation (#95) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### 📖 Summary - fixes starship prompt installation after installer introduced version args. Using static latest version tag for now. - disables Woodpecker Portainer trigger step. Not needed for updating image tags and auto redeploy in Portainer EE. ### 📑 Test Plan ✅ CI pipeline tests (Default) ### 💬 Details _No response_ ### 📚 Additional Notes _No response_ Reviewed-on: https://gitea.ocram85.com/CodeServer/arkanum/pulls/95 --- .woodpecker/ci.yml | 19 ++++++++++--------- Dockerfile | 5 ++++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.woodpecker/ci.yml b/.woodpecker/ci.yml index 6757c5e..972ce9e 100644 --- a/.woodpecker/ci.yml +++ b/.woodpecker/ci.yml @@ -82,15 +82,16 @@ steps: when: event: [pull_request] - triggerPortainer: - image: ocram85/portainer-serviceupdate - settings: - VERBOSE: true - URI: "https://portainer.ocram85.com" - TOKEN: - from_secret: NEXT_TOKEN - when: - event: [pull_request] + # disabled for Portainer-EE: Can handle image tag updates without manual redeploy + #triggerPortainer: + # image: ocram85/portainer-serviceupdate + # settings: + # VERBOSE: true + # URI: "https://portainer.ocram85.com" + # TOKEN: + # from_secret: NEXT_TOKEN + # when: + # event: [pull_request] gitea-release: image: plugins/gitea-release diff --git a/Dockerfile b/Dockerfile index ed83799..7d3e726 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,10 @@ LABEL org.opencontainers.image.documentation="https://gitea.ocram85.com/CodeServ RUN \ echo "**** install starship prompt ****" && \ - curl -sS https://starship.rs/install.sh | sh -s -- -f && \ + curl -sS -o /tmp/install.sh https://starship.rs/install.sh && \ + chmod +x /tmp/install.sh && \ + /tmp/install.sh --verbose --force --version latest && \ + rm -f /tmp/install.sh && \ echo "eval \"\$(starship init bash)\"" >> /etc/bash.bashrc ENV STARSHIP_CONFIG=/etc/starship.toml