From a19cef9411bf4494b8821b0cd9f64802a0a27b72 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 5 Nov 2022 23:44:36 -0400 Subject: [PATCH] fix: install official docker package from docker upstream This ensures the docker version we ship to in the docker image can actually install the docker-compose-plugin. --- Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 748c4f34c..b6215dce8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,13 @@ COPY ./build/package/ /tmp SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=DL3005,DL3008 -RUN echo "dokku dokku/hostname string $DOKKU_HOSTNAME" | debconf-set-selections \ +RUN mkdir -p /etc/apt/keyrings \ + && mkdir -p /etc/apt/keyrings \ + && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \ + && apt-get update \ + && apt-get -y --no-install-recommends install docker-ce docker-ce-cli containerd.io docker-compose-plugin \ + && echo "dokku dokku/hostname string $DOKKU_HOSTNAME" | debconf-set-selections \ && echo "dokku dokku/skip_key_file boolean $DOKKU_SKIP_KEY_FILE" | debconf-set-selections \ && echo "dokku dokku/vhost_enable boolean $DOKKU_VHOST_ENABLE" | debconf-set-selections \ && curl -sSL https://packagecloud.io/dokku/dokku/gpgkey | apt-key add - \