From b659ec36025e4fa81ad95452f376606a87be3118 Mon Sep 17 00:00:00 2001
From: 0xaatif <asyed@polygon.technology>
Date: Thu, 4 Jul 2024 10:40:19 +0100
Subject: [PATCH] refactor: one image

---
 .github/workflows/docker_build.yml      | 10 +++++-----
 .github/workflows/docker_build_push.yml | 14 +-------------
 Dockerfile                              | 21 ++-------------------
 3 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
index 41bdbbbf7..c907bbf39 100644
--- a/.github/workflows/docker_build.yml
+++ b/.github/workflows/docker_build.yml
@@ -19,8 +19,8 @@ jobs:
         uses: actions/checkout@v4
 
       - run: |
-          docker build --progress=plain --build-arg=PROFILE=dev --build-arg=ENTRYPOINT=leader --tag scratch .
-          docker run --rm scratch --help
-
-          docker build --progress=plain --build-arg=PROFILE=dev --build-arg=ENTRYPOINT=worker --tag scratch .
-          docker run --rm scratch --help
+          docker build --progress=plain --build-arg=PROFILE=dev --tag scratch .
+          docker run --rm --init --entrypoint leader scratch --help
+          docker run --rm --init --entrypoint worker scratch --help
+          docker run --rm --init --entrypoint rpc scratch --help
+          docker run --rm --init --entrypoint verifier scratch --help
diff --git a/.github/workflows/docker_build_push.yml b/.github/workflows/docker_build_push.yml
index 1727bd682..ff37de6be 100644
--- a/.github/workflows/docker_build_push.yml
+++ b/.github/workflows/docker_build_push.yml
@@ -46,10 +46,9 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
 
-      - name: Push to GitHub Container Registry - Leader
+      - name: Push to GitHub Container Registry
         uses: docker/build-push-action@v3
         with:
-          build-args: ["ENTRYPOINT=leader"]
           push: true
           # platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta_leader.outputs.tags }}
@@ -68,14 +67,3 @@ jobs:
             type=ref,event=pr
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
-
-      - name: Push to GitHub Container Registry - Worker
-        uses: docker/build-push-action@v3
-        with:
-          build-args: ["ENTRYPOINT=worker"]
-          push: true
-          # platforms: linux/amd64,linux/arm64
-          tags: ${{ steps.meta_worker.outputs.tags }}
-          labels: ${{ steps.meta_worker.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
diff --git a/Dockerfile b/Dockerfile
index c05e80c53..a95629433 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 # This is loosely based on `docker init`'s rust template.
 # For a completely clean build, run something like this:
 # ```
-# docker build --build-arg=PROFILE=dev --build-arg=ENTRYPOINT=leader --no-cache
+# docker build --build-arg=PROFILE=dev --no-cache
 # ```
 
 #############
@@ -80,26 +80,9 @@ FROM debian:bullseye-slim AS final
 RUN apt-get update && apt-get install -y \
     ca-certificates \
     libjemalloc2 \
-    libssl-dev \
-    tini \
     && rm -rf /var/lib/apt/lists/*
 
-COPY --from=build /output/* /usr/local/bin/
-RUN <<EOF
-set -eux
-: smoke test executables
-find /usr/local/bin -type f -executable -print0 \
-    | xargs --null --replace --verbose tini -- {} --help
-EOF
-
-# can't refer to docker args in an ENTRYPOINT directive, so go through a symlink
-ARG ENTRYPOINT
-RUN ln --symbolic --verbose -- "$(which ${ENTRYPOINT})" /entrypoint
-ENTRYPOINT [ "tini", "--", "/entrypoint" ]
-
-# TODO(0xaatif): https://github.com/0xPolygonZero/zk_evm/issues/356
-#                this is bad practice
-COPY .env /
+COPY --from=build ["/output/rpc", "/output/leader", "/output/worker", "/output/verifier", "/usr/local/bin/"]
 
 # Create a non-privileged user that the app will run under.
 # See https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#user