From 6cb7d52a29c68cdc4eafabb6dfe7594c288d151e Mon Sep 17 00:00:00 2001
From: Rafael Matias <rafael@skyle.net>
Date: Tue, 12 Feb 2019 08:34:08 +0100
Subject: [PATCH] swarm/docker: add global-store and split docker images
(#19038)
---
swarm/docker/Dockerfile | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/swarm/docker/Dockerfile b/swarm/docker/Dockerfile
index 1ee4e9734..9450609dd 100644
--- a/swarm/docker/Dockerfile
+++ b/swarm/docker/Dockerfile
@@ -10,14 +10,23 @@ RUN mkdir -p $GOPATH/src/github.com/ethereum && \
git checkout ${VERSION} && \
go install -ldflags "-X main.gitCommit=${VERSION}" ./cmd/swarm && \
go install -ldflags "-X main.gitCommit=${VERSION}" ./cmd/swarm/swarm-smoke && \
- go install -ldflags "-X main.gitCommit=${VERSION}" ./cmd/geth && \
- cp $GOPATH/bin/swarm /swarm && cp $GOPATH/bin/geth /geth && cp $GOPATH/bin/swarm-smoke /swarm-smoke
+ go install -ldflags "-X main.gitCommit=${VERSION}" ./cmd/swarm/global-store && \
+ go install -ldflags "-X main.gitCommit=${VERSION}" ./cmd/geth
-# Release image with the required binaries and scripts
-FROM alpine:3.8
+FROM alpine:3.8 as swarm-smoke
WORKDIR /
-COPY --from=builder /swarm /geth /swarm-smoke /
-ADD run.sh /run.sh
+COPY --from=builder /go/bin/swarm-smoke /
ADD run-smoke.sh /run-smoke.sh
+ENTRYPOINT ["/run-smoke.sh"]
+
+FROM alpine:3.8 as swarm-global-store
+WORKDIR /
+COPY --from=builder /go/bin/global-store /
+ENTRYPOINT ["/global-store"]
+
+FROM alpine:3.8 as swarm
+WORKDIR /
+COPY --from=builder /go/bin/swarm /go/bin/geth /
+ADD run.sh /run.sh
ENTRYPOINT ["/run.sh"]
--
GitLab