From 526d8a9a30778b560667f1072272e8a4ddacc866 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 4 Apr 2024 17:26:59 +0200 Subject: [PATCH 1/5] disable portainer trigger --- .woodpecker/ci.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 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 -- 2.45.1 From f2851e603e91b6ba5fc7b878754080328819dea5 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Fri, 5 Apr 2024 07:58:58 +0200 Subject: [PATCH 2/5] debug starship install command --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ed83799..2ac6b12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ 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 https://starship.rs/install.sh | sh -s && \ echo "eval \"\$(starship init bash)\"" >> /etc/bash.bashrc ENV STARSHIP_CONFIG=/etc/starship.toml -- 2.45.1 From 8deb1620ac5a968dac863a7ec4fb78cb2ac15cf8 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Fri, 5 Apr 2024 08:02:23 +0200 Subject: [PATCH 3/5] split download and install command of starship --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2ac6b12..29580ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,9 @@ LABEL org.opencontainers.image.documentation="https://gitea.ocram85.com/CodeServ RUN \ echo "**** install starship prompt ****" && \ - curl -sS https://starship.rs/install.sh | sh -s && \ + curl -sS -o /tmp/install.sh https://starship.rs/install.sh && \ + /tmp/install.sh && \ + rm -f /tmp/install.sh && \ echo "eval \"\$(starship init bash)\"" >> /etc/bash.bashrc ENV STARSHIP_CONFIG=/etc/starship.toml -- 2.45.1 From 9b915ae0aba0e821bce713b10e655d213f1d1f37 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Fri, 5 Apr 2024 08:06:39 +0200 Subject: [PATCH 4/5] set propper file permissions --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 29580ca..df6abd2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,8 @@ LABEL org.opencontainers.image.documentation="https://gitea.ocram85.com/CodeServ RUN \ echo "**** install starship prompt ****" && \ curl -sS -o /tmp/install.sh https://starship.rs/install.sh && \ - /tmp/install.sh && \ + chmod +x /tmp/install.sh && \ + /tmp/install.sh -f && \ rm -f /tmp/install.sh && \ echo "eval \"\$(starship init bash)\"" >> /etc/bash.bashrc -- 2.45.1 From a053ea73155f703a6cbc968a8c0b805142a02871 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Fri, 5 Apr 2024 08:11:34 +0200 Subject: [PATCH 5/5] pin installed version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index df6abd2..7d3e726 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN \ echo "**** install starship prompt ****" && \ curl -sS -o /tmp/install.sh https://starship.rs/install.sh && \ chmod +x /tmp/install.sh && \ - /tmp/install.sh -f && \ + /tmp/install.sh --verbose --force --version latest && \ rm -f /tmp/install.sh && \ echo "eval \"\$(starship init bash)\"" >> /etc/bash.bashrc -- 2.45.1