From d01c72304a833dd5bf00ecb5f031f6a11d9fe3e8 Mon Sep 17 00:00:00 2001
From: dylanverstraete <dylan_verstraete1@hotmail.com>
Date: Fri, 16 Jun 2023 09:16:18 +0200
Subject: [PATCH] fix(bridge): docker build

---
 .dockerignore                     |  6 ++++++
 bridge/tfchain_bridge/Dockerfile  | 19 ++++++++++++++-----
 bridge/tfchain_bridge/building.md |  5 ++++-
 3 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..6afc59d06
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,6 @@
+substrate-node
+activation-service
+clients/tfchain-client-rs
+clients/tfchain-client-js
+tools
+cli-tool
diff --git a/bridge/tfchain_bridge/Dockerfile b/bridge/tfchain_bridge/Dockerfile
index 0d2cadb81..fecff7b53 100644
--- a/bridge/tfchain_bridge/Dockerfile
+++ b/bridge/tfchain_bridge/Dockerfile
@@ -1,9 +1,18 @@
 FROM golang:alpine3.14 as BUILDER
-WORKDIR /opt/tfchain
-COPY . .
-WORKDIR /opt/tfchain
-RUN go build
+
+WORKDIR /src
+
+ADD bridge/tfchain_bridge /src/bridge/tfchain_bridge
+ADD clients/tfchain-client-go /src/clients/tfchain-client-go
+
+WORKDIR /src
+
+RUN cd /src/bridge/tfchain_bridge &&\
+    CGO_ENABLED=0 GOOS=linux go build -ldflags "-w -s -X main.GitCommit=${version} -extldflags '-static'"  -o tfchain_bridge &&\ 
+    chmod +x tfchain_bridge
 
 FROM alpine:3.13.5
-COPY --from=BUILDER /opt/tfchain/tfchain_bridge /bin/
+
+COPY --from=BUILDER /src/bridge/tfchain_bridge/tfchain_bridge /bin/
+
 ENTRYPOINT [ "/bin/tfchain_bridge" ]
diff --git a/bridge/tfchain_bridge/building.md b/bridge/tfchain_bridge/building.md
index b98057ae6..eba645be2 100644
--- a/bridge/tfchain_bridge/building.md
+++ b/bridge/tfchain_bridge/building.md
@@ -8,6 +8,9 @@ This is a normal go project so just execute `go build`.
 
 To build a docker image with the latest git tag as version:
 
+Note: this assumes you are in this directory (bridge/tfchain_bridge)
+
 ```sh
-docker build -t tftchainstellarbridge:$(git describe --abbrev=0 --tags | sed 's/^v//')  .
+cd ../../
+docker build -t tftchainstellarbridge:$(git describe --abbrev=0 --tags | sed 's/^v//')  . -f bridge/tfchain_bridge/Dockerfile
 ```