diff --git a/workbench/Dockerfile b/workbench/Dockerfile index 9504d9aff068daa3767f294f1e0c7cbe44be764a..ac73c8f3078eb8d1ea5219db2db75d34eec06b2a 100644 --- a/workbench/Dockerfile +++ b/workbench/Dockerfile @@ -255,20 +255,18 @@ RUN export GOPATH=/usr/local/lib/go && \ go install sigs.k8s.io/kustomize/kustomize/v5@latest && \ go install github.com/1player/host-spawn@latest && \ rm -rf /tmp/* /var/tmp/* ~/.cache/* -RUN wget https://raw.githubusercontent.com/rabbitmq/rabbitmq-server/v3.12.6/deps/rabbitmq_management/bin/rabbitmqadmin -qO /usr/local/bin/rabbitmqadmin && \ - chmod +x /usr/local/bin/rabbitmqadmin && \ - wget https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-x86_64 -qO /usr/local/bin/docker-compose && \ - chmod +x /usr/local/bin/docker-compose && \ +# 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 && \ - wget 'https://repo1.maven.org/maven2/com/madgag/bfg/1.14.0/bfg-1.14.0.jar' -qO /usr/local/share/bfg/bfg.jar && \ - curl --silent --location --fail --show-error "https://github.com/genuinetools/reg/releases/download/v0.16.1/reg-$(go env GOOS)-$(go env GOARCH)" --output /tmp/reg && \ - install -o root -g root -m 0755 /tmp/reg /usr/local/bin/reg && \ - curl --silent --location --fail --show-error "https://github.com/rancher/rke/releases/download/v1.4.10/rke_$(go env GOOS)-$(go env GOARCH)" --output /tmp/rke && \ - install -o root -g root -m 0755 /tmp/rke /usr/local/bin/rke && \ - curl --silent --location --fail --show-error https://github.com/SelfAdjointOperator/better-adb-sync/archive/refs/heads/master.tar.gz | tar -zxC /opt/ && \ + install <(curl 'https://repo1.maven.org/maven2/com/madgag/bfg/1.14.0/bfg-1.14.0.jar') /usr/local/share/bfg/bfg.jar && \ + 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 && \ + 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 && \ - git clone https://github.com/asdf-vm/asdf.git /opt/asdf && \ - ln --symbolic --target /etc/profile.d/ /opt/asdf/asdf.sh && \ + curl https://github.com/asdf-vm/asdf/archive/refs/heads/master.tar.gz | tar -zxC /tmp && \ + ln --symbolic --target /etc/profile.d/ /opt/asdf-master/asdf.sh && \ echo "export PATH=$PIPX_BIN_DIR:/usr/local/lib/go/bin:\$PATH" > /etc/profile.d/workbench.sh && \ rm -rf /tmp/* /var/tmp/* ~/.cache/* RUN _PIPENV_COMPLETE=bash_source pipenv > /etc/bash_completion.d/pipenv && \ @@ -289,7 +287,7 @@ RUN _PIPENV_COMPLETE=bash_source pipenv > /etc/bash_completion.d/pipenv && \ wget https://raw.githubusercontent.com/dsifford/yarn-completion/v0.17.0/yarn-completion.bash -qO /etc/bash_completion.d/yarn && \ wget https://github.com/containers/podman/raw/main/completions/bash/podman -qO /etc/bash_completion.d/podman && \ #wget https://raw.githubusercontent.com/ziglang/shell-completions/master/_zig -qO /etc/bash_completion.d/zig && \ - ln --symbolic /opt/asdf/completions/asdf.bash /etc/bash_completion.d/asdf && \ + ln --symbolic /opt/asdf-master/completions/asdf.bash /etc/bash_completion.d/asdf && \ rm -rf /tmp/* /var/tmp/* ~/.cache/* RUN mkdir -p /usr/local/share/ca-certificates && \ wget https://s3.amazonaws.com/rds-downloads/rds-combined-ca-bundle.pem -qO - | \ @@ -299,6 +297,6 @@ RUN mkdir -p /usr/local/share/ca-certificates && \ rm -rf /tmp/* /var/tmp/* ~/.cache/* COPY --chown=root:root bash_completion.d/* /etc/bash_completion.d/ COPY --chown=root:root bin/* /usr/local/bin/ -ENV ASDF_DIR /opt/asdf +ENV ASDF_DIR /opt/asdf-master VOLUME /run/sshd CMD ["/bin/bash"]