diff --git a/workbench/Dockerfile b/workbench/Dockerfile index fa01fe45d57728da86683726664516346bf641c7..0ed64c16cc95bead1aad199b941245fe778d9321 100644 --- a/workbench/Dockerfile +++ b/workbench/Dockerfile @@ -5,8 +5,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-xc"] ENV PATH /opt/pipx/bin:/usr/local/lib/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin # hadolint ignore=DL3008 RUN apt-get update && \ - curl --location --silent --fail --show-error https://github.com/kubernetes/kompose/releases/download/v1.26.1/kompose_1.26.1_amd64.deb --output /tmp/kompose.deb && \ - curl --location --silent --fail --show-error https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb --output /tmp/session-manager-plugin.deb && \ + curl "https://github.com/kubernetes/kompose/releases/download/v1.26.1/kompose_1.26.1_$(dpkg --print-architecture).deb" --output /tmp/kompose.deb && \ + curl https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb --output /tmp/session-manager-plugin.deb && \ DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \ /tmp/kompose.deb \ /tmp/session-manager-plugin.deb \ @@ -256,13 +256,12 @@ RUN export GOPATH=/usr/local/lib/go && \ go install github.com/1player/host-spawn@latest && \ rm -rf /tmp/* /var/tmp/* ~/.cache/* # hadolint ignore=SC2263 -RUN alias curl='curl --silent --location --fail --show-error --compressed --proto "=https"' && \ - install -m 0755 <(curl https://raw.githubusercontent.com/rabbitmq/rabbitmq-server/v3.12.6/deps/rabbitmq_management/bin/rabbitmqadmin) /usr/local/bin/rabbitmqadmin && \ - install -m 0755 <(curl https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-x86_64) /usr/local/bin/docker-compose && \ - mkdir /usr/local/share/bfg && \ - install <(curl 'https://repo1.maven.org/maven2/com/madgag/bfg/1.14.0/bfg-1.14.0.jar') /usr/local/share/bfg/bfg.jar && \ +RUN install -m 0755 <(curl https://raw.githubusercontent.com/rabbitmq/rabbitmq-server/v3.12.6/deps/rabbitmq_management/bin/rabbitmqadmin) /usr/local/bin/rabbitmqadmin && \ + install -m 0755 <(curl "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-$(uname -m)") /usr/local/bin/docker-compose && \ install -m 0755 <(curl "https://github.com/genuinetools/reg/releases/download/v0.16.1/reg-$(go env GOOS)-$(go env GOARCH)") /usr/local/bin/reg && \ install -m 0755 <(curl "https://github.com/rancher/rke/releases/download/v1.4.10/rke_$(go env GOOS)-$(go env GOARCH)") /usr/local/bin/rke && \ + mkdir /usr/local/share/bfg && \ + install <(curl 'https://repo1.maven.org/maven2/com/madgag/bfg/1.14.0/bfg-1.14.0.jar') /usr/local/share/bfg/bfg.jar && \ curl https://github.com/SelfAdjointOperator/better-adb-sync/archive/refs/heads/master.tar.gz | tar -zxC /opt/ && \ ln --symbolic /opt/better-adb-sync-master/src/adbsync.py /usr/local/bin/adbsync && \ curl https://github.com/asdf-vm/asdf/archive/refs/heads/master.tar.gz | tar -zxC /tmp && \