From 40df5c877e3894e7c62fe21ddba6ddfe50cc96a0 Mon Sep 17 00:00:00 2001 From: Kot Date: Tue, 9 Aug 2022 19:27:31 -0700 Subject: [PATCH] Fix dockerd not being present --- Dockerfile | 10 +++------- entrypoint | 2 +- fly.toml | 5 +---- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index f0a3ddb..3f82be1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,9 @@ -FROM docker/buildx-bin:v0.8 as buildx +FROM docker:dind -FROM docker:20 - -RUN apk add bash ip6tables pigz sysstat procps lsof +RUN apk add bash ip6tables pigz sysstat procps lsof gcompat COPY etc/docker/daemon.json /etc/docker/daemon.json -COPY --from=buildx /buildx /root/.docker/cli-plugins/docker-buildx - COPY ./entrypoint ./entrypoint COPY ./docker-entrypoint.d/* ./docker-entrypoint.d/ @@ -15,4 +11,4 @@ ENV DOCKER_TMPDIR=/data/docker/tmp ENTRYPOINT ["./entrypoint"] -CMD ["dockerd", "-p", "/var/run/docker.pid"] \ No newline at end of file +CMD ["dockerd", "-p", "/var/run/docker.pid"] diff --git a/entrypoint b/entrypoint index 1eaa7fd..89e5fe3 100755 --- a/entrypoint +++ b/entrypoint @@ -10,4 +10,4 @@ fi echo "Running $@" -exec "$@" \ No newline at end of file +exec "$@" diff --git a/fly.toml b/fly.toml index 3b0af74..7c93a40 100644 --- a/fly.toml +++ b/fly.toml @@ -1,7 +1,4 @@ -# fly.toml file generated for docker-for-kurt on 2021-06-23T18:04:47-05:00 - -app = "docker-for-kurt" - +app = "rem" kill_signal = "SIGINT" kill_timeout = 5