From e75d1bda812a276cb23529de53fc47b12f028342 Mon Sep 17 00:00:00 2001 From: Graham Brereton <97901780+grahambrereton-form3@users.noreply.github.com> Date: Mon, 30 Oct 2023 10:02:41 -0400 Subject: [PATCH] chore: use form3tech-oss/toda in chaos-daemon build (#50) * chore: use form3tech-oss/toda in chaos-daemon build * fix: don't use curl --insecure --- images/chaos-daemon/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/images/chaos-daemon/Dockerfile b/images/chaos-daemon/Dockerfile index b6e6537282f..8a6b4e9570e 100644 --- a/images/chaos-daemon/Dockerfile +++ b/images/chaos-daemon/Dockerfile @@ -11,13 +11,13 @@ ENV https_proxy $HTTPS_PROXY ARG TARGET_PLATFORM=amd64 RUN mkdir -p /tmp/bin && \ - curl -k -L https://mirrors.chaos-mesh.org/byteman-chaos-mesh-download-v4.0.20-0.12.tar.gz -o /usr/local/byteman.tar.gz && \ + curl -L https://mirrors.chaos-mesh.org/byteman-chaos-mesh-download-v4.0.20-0.12.tar.gz -o /usr/local/byteman.tar.gz && \ tar xvf /usr/local/byteman.tar.gz -C /usr/local && \ mv /usr/local/byteman-chaos-mesh-download-v4.0.20-0.12 /tmp/byteman && \ rm /usr/local/byteman.tar.gz # toda doesn't support arm64 yet -RUN curl -k -L https://github.com/chaos-mesh/toda/releases/download/v0.2.3/toda-linux-amd64.tar.gz | tar xz -C /tmp/bin +RUN curl -L https://github.com/form3tech-oss/toda/releases/download/v0.2.3-f3-rorootfs-pre1/toda-linux-amd64.tar.gz | tar xz -C /tmp/bin RUN case "$TARGET_PLATFORM" in \ 'amd64') \ export NSEXEC_ARCH='x86_64'; \ @@ -27,9 +27,9 @@ RUN case "$TARGET_PLATFORM" in \ ;; \ *) echo >&2 "error: unsupported architecture '$TARGET_PLATFORM'"; exit 1 ;; \ esac; \ - curl -k -L https://github.com/chaos-mesh/nsexec/releases/download/v0.1.6/nsexec-$NSEXEC_ARCH-unknown-linux-gnu.tar.gz | tar xz -C /tmp/bin; \ - curl -k -L https://github.com/chaos-mesh/chaos-tproxy/releases/download/v0.5.3/tproxy-$NSEXEC_ARCH.tar.gz | tar xz -C /tmp/bin; \ - curl -k -L https://github.com/chaos-mesh/memStress/releases/download/v0.3/memStress_v0.3-$NSEXEC_ARCH-linux-gnu.tar.gz | tar xz -C /tmp/bin + curl -L https://github.com/chaos-mesh/nsexec/releases/download/v0.1.6/nsexec-$NSEXEC_ARCH-unknown-linux-gnu.tar.gz | tar xz -C /tmp/bin; \ + curl -L https://github.com/chaos-mesh/chaos-tproxy/releases/download/v0.5.3/tproxy-$NSEXEC_ARCH.tar.gz | tar xz -C /tmp/bin; \ + curl -L https://github.com/chaos-mesh/memStress/releases/download/v0.3/memStress_v0.3-$NSEXEC_ARCH-linux-gnu.tar.gz | tar xz -C /tmp/bin