From 59094a639ef2460fe9ef003b6b72a9601cb43b8a Mon Sep 17 00:00:00 2001
From: Jacek Nykis <jacek@stellar.org>
Date: Wed, 30 Sep 2020 13:27:33 +0100
Subject: [PATCH 1/2] Add friendbot Dockerfile and Makefile

---
 Makefile                             |  3 +++
 services/friendbot/Makefile          | 13 +++++++++++++
 services/friendbot/docker/Dockerfile | 13 +++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 services/friendbot/Makefile
 create mode 100644 services/friendbot/docker/Dockerfile

diff --git a/Makefile b/Makefile
index 6b5d941fa4..c0983d2e50 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,9 @@ keystore:
 ticker:
 	$(MAKE) -C services/ticker/ docker-build
 
+friendbot:
+	$(MAKE) -C services/friendbot/ docker-build
+
 webauth:
 	$(MAKE) -C exp/services/webauth/ docker-build
 
diff --git a/services/friendbot/Makefile b/services/friendbot/Makefile
new file mode 100644
index 0000000000..bf5f67cd21
--- /dev/null
+++ b/services/friendbot/Makefile
@@ -0,0 +1,13 @@
+# Check if we need to prepend docker commands with sudo
+SUDO := $(shell docker version >/dev/null 2>&1 || echo "sudo")
+
+# If TAG is not provided set default value
+TAG ?= stellar/friendbot:$(shell git rev-parse --short HEAD)$(and $(shell git status -s),-dirty-$(shell id -u -n))
+
+docker-build:
+	cd ../../ && \
+	$(SUDO) docker build -f services/friendbot/docker/Dockerfile -t $(TAG) .
+
+docker-push:
+	cd ../../ && \
+	$(SUDO) docker push $(TAG)
diff --git a/services/friendbot/docker/Dockerfile b/services/friendbot/docker/Dockerfile
new file mode 100644
index 0000000000..0a79c03baa
--- /dev/null
+++ b/services/friendbot/docker/Dockerfile
@@ -0,0 +1,13 @@
+FROM golang:1.14-stretch as build
+
+ADD . /src/friendbot
+WORKDIR /src/friendbot
+RUN go mod vendor
+RUN go build -o /bin/friendbot -mod=vendor ./services/friendbot
+
+FROM ubuntu:16.04
+
+RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates
+COPY --from=build /bin/friendbot /app/
+EXPOSE 8004
+ENTRYPOINT ["/app/friendbot"]

From f81624ad42e77e7445afefab4ce7cf38d9b06e87 Mon Sep 17 00:00:00 2001
From: Jacek Nykis <jacek@stellar.org>
Date: Thu, 1 Oct 2020 15:13:06 +0100
Subject: [PATCH 2/2] Drop vendoring

---
 services/friendbot/docker/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/friendbot/docker/Dockerfile b/services/friendbot/docker/Dockerfile
index 0a79c03baa..51935ac60e 100644
--- a/services/friendbot/docker/Dockerfile
+++ b/services/friendbot/docker/Dockerfile
@@ -2,8 +2,7 @@ FROM golang:1.14-stretch as build
 
 ADD . /src/friendbot
 WORKDIR /src/friendbot
-RUN go mod vendor
-RUN go build -o /bin/friendbot -mod=vendor ./services/friendbot
+RUN go build -o /bin/friendbot ./services/friendbot
 
 FROM ubuntu:16.04