From 7ecf71ba478eb74761e9638a0fef1196ab8b7eb3 Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Fri, 15 Apr 2022 21:27:34 -0400 Subject: [PATCH] [docker-up] Add docker-compose binary --- components/docker-up/BUILD.yaml | 3 +++ components/docker-up/leeway.Dockerfile | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/components/docker-up/BUILD.yaml b/components/docker-up/BUILD.yaml index bd309111d51eda..3a1268b0766f24 100644 --- a/components/docker-up/BUILD.yaml +++ b/components/docker-up/BUILD.yaml @@ -40,6 +40,9 @@ packages: - ["rm", "-r", "components-docker-up--bin-docker-up"] - ["mv", "components-docker-up--bin-runc-facade/docker-up", "runc-facade"] - ["rm", "-r", "components-docker-up--bin-runc-facade"] + # Override docker-compose with custom version https://github.com/aledbf/compose/pull/1 + - ["curl", "-sSL", "https://github.com/aledbf/compose/releases/download/v2.4.1.1-gitpod/docker-compose-linux-x86_64", "-o", "docker-compose"] + - ["chmod", "+x", "docker-compose"] - name: docker type: docker deps: diff --git a/components/docker-up/leeway.Dockerfile b/components/docker-up/leeway.Dockerfile index ea3c2581876eff..9e73f2ef576c25 100644 --- a/components/docker-up/leeway.Dockerfile +++ b/components/docker-up/leeway.Dockerfile @@ -5,6 +5,8 @@ FROM scratch LABEL skip-n.registry-facade.gitpod.io="1" + WORKDIR /usr/bin +COPY components-docker-up--app/* ./ -COPY components-docker-up--app/* ./ \ No newline at end of file +COPY components-docker-up--app/docker-compose /usr/local/bin/docker-compose