From 21c89d3affb96dec07f8851edf3f7786816aae6e Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 1 Feb 2025 15:00:47 +0200
Subject: [PATCH] Workbench: Update Docker Compose.
---
workbench/Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/workbench/Dockerfile b/workbench/Dockerfile
index 62017b4..928f819 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 && \
--
GitLab