From eb85282b131c513b546894b6f4f64254c31ead8d Mon Sep 17 00:00:00 2001 From: Mike Jones Date: Tue, 14 Apr 2026 13:01:02 +0000 Subject: [PATCH 1/2] Somebody moved funnel! It now seems to be located in a repo owned by 'calypr'. Added a sed to the curl in the Dockerfile to replace 'ohsu-comp-bio' with 'calypr' in the install script. This is a bit hackey, but, calypr's install script is currently broken and until this is fixed, this work while the old assets remains. --- ServiceStack/compose-manifests/tes/funnel/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ServiceStack/compose-manifests/tes/funnel/Dockerfile b/ServiceStack/compose-manifests/tes/funnel/Dockerfile index 5c727d7..f3ab0c5 100644 --- a/ServiceStack/compose-manifests/tes/funnel/Dockerfile +++ b/ServiceStack/compose-manifests/tes/funnel/Dockerfile @@ -3,7 +3,7 @@ ARG FUNNEL_VERSION USER root RUN apk add --no-cache curl perl-utils \ - && sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohsu-comp-bio/funnel/refs/heads/develop/install.sh)" -- ${FUNNEL_VERSION} \ + && sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohsu-comp-bio/funnel/refs/heads/develop/install.sh |sed -e 's/ohsu-comp-bio/calypr/')" -- ${FUNNEL_VERSION} \ && cp /root/.local/bin/funnel /usr/local/bin/funnel \ && chown rootless:rootless /usr/local/bin/funnel \ && chmod +x /usr/local/bin/funnel \ From 03e6dec2997b977fb69cbea58a355a0d1fe125fd Mon Sep 17 00:00:00 2001 From: Mike Jones Date: Tue, 14 Apr 2026 13:12:19 +0000 Subject: [PATCH 2/2] Install pulls the script from calypr. It is currently an identical script to the ohsu-comp-bio version, but this is likely the best future proofing; as, when they fix this, the sed will not match any strings to replace. --- ServiceStack/compose-manifests/tes/funnel/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ServiceStack/compose-manifests/tes/funnel/Dockerfile b/ServiceStack/compose-manifests/tes/funnel/Dockerfile index f3ab0c5..b47bf6a 100644 --- a/ServiceStack/compose-manifests/tes/funnel/Dockerfile +++ b/ServiceStack/compose-manifests/tes/funnel/Dockerfile @@ -3,7 +3,7 @@ ARG FUNNEL_VERSION USER root RUN apk add --no-cache curl perl-utils \ - && sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohsu-comp-bio/funnel/refs/heads/develop/install.sh |sed -e 's/ohsu-comp-bio/calypr/')" -- ${FUNNEL_VERSION} \ + && sh -c "$(curl -fsSL https://raw.githubusercontent.com/calypr/funnel/refs/heads/develop/install.sh |sed -e 's/ohsu-comp-bio/calypr/')" -- ${FUNNEL_VERSION} \ && cp /root/.local/bin/funnel /usr/local/bin/funnel \ && chown rootless:rootless /usr/local/bin/funnel \ && chmod +x /usr/local/bin/funnel \