diff --git a/workbench/Dockerfile b/workbench/Dockerfile index 62017b47aa16b4d52b541fe035715bcc532d04c0..928f8198c26d3928323bb3e6d70144f980d8c811 100644 --- a/workbench/Dockerfile +++ b/workbench/Dockerfile @@ -44,6 +44,7 @@ RUN apt-get update && \ dnsutils \ docker-buildx-plugin \ docker-cli \ + docker-compose-plugin \ dos2unix \ easy-rsa \ entr \ @@ -173,6 +174,7 @@ RUN apt-get update && \ zip \ && \ rm /etc/ssh/ssh_host_* && \ + ln -s /usr/libexec/docker/cli-plugins/docker-compose /usr/local/bin/docker-compose && \ rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* /var/cache/apt/archives/* ENV PIPX_HOME /opt/pipx ENV PIPX_BIN_DIR /opt/pipx/bin @@ -285,7 +287,6 @@ RUN export GOPATH=/usr/local/lib/go && \ rm -rf /tmp/* /var/tmp/* ~/.cache/* # hadolint ignore=SC2263 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 && \ install -m 0755 <(curl "https://pkgx.sh/Linux/$(uname -m)") /usr/local/bin/pkgx && \