From 2cc65ccae453569012cd5e32bd63c8778a2abb03 Mon Sep 17 00:00:00 2001
From: Matthew Jaffee <jaffee@pilosa.com>
Date: Thu, 3 Feb 2022 16:55:48 -0600
Subject: [PATCH] get rid of 'image' in clustertests which was causing issues

---
 Dockerfile-clustertests-client           | 35 ++++++++++++++++++++++++
 internal/clustertests/Dockerfile         |  3 --
 internal/clustertests/docker-compose.yml |  6 ++--
 3 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 Dockerfile-clustertests-client
 delete mode 100644 internal/clustertests/Dockerfile

diff --git a/Dockerfile-clustertests-client b/Dockerfile-clustertests-client
new file mode 100644
index 000000000..553bffe03
--- /dev/null
+++ b/Dockerfile-clustertests-client
@@ -0,0 +1,35 @@
+# This Dockerfile is used for cluster testing - it produces a much larger image
+# and includes all of Go as well as some utilities.
+
+FROM golang:1.16
+
+LABEL maintainer "dev@pilosa.com"
+
+COPY . /go/src/github.com/molecula/featurebase/
+
+RUN cd /go/src/github.com/molecula/featurebase \
+    && make install FLAGS="-a -mod=vendor"
+
+# download pumba for fault injection
+ADD https://github.com/alexei-led/pumba/releases/download/0.6.0/pumba_linux_amd64 /pumba
+RUN chmod +x /pumba
+
+# add docker client to pause/unpause nodes
+RUN apt update
+RUN apt install -y docker.io 
+
+# add docker-compose so tests can use it for stuff
+ADD https://github.com/docker/compose/releases/latest/download/docker-compose-Linux-x86_64 /usr/local/bin/docker-compose
+RUN chmod +x /usr/local/bin/docker-compose
+
+RUN cp /go/bin/featurebase /featurebase
+
+COPY NOTICE /NOTICE
+
+COPY ./internal/clustertests /go/src/github.com/molecula/featurebase/internal/clustertests
+
+EXPOSE 10101
+VOLUME /data
+
+ENTRYPOINT ["bash", "-c"]
+CMD ["/featurebase", "server", "--data-dir", "/data", "--bind", "http://0.0.0.0:10101"]
diff --git a/internal/clustertests/Dockerfile b/internal/clustertests/Dockerfile
deleted file mode 100644
index 8d2b5d0e2..000000000
--- a/internal/clustertests/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM ptest
-
-COPY . /go/src/github.com/molecula/featurebase/internal/clustertests
diff --git a/internal/clustertests/docker-compose.yml b/internal/clustertests/docker-compose.yml
index 7b3373f79..3df2d321d 100644
--- a/internal/clustertests/docker-compose.yml
+++ b/internal/clustertests/docker-compose.yml
@@ -4,7 +4,6 @@ services:
     build:
       context: ../..
       dockerfile: Dockerfile-clustertests
-    image: ptest
     environment:
       - PILOSA_NAME=pilosa1
       - PILOSA_ETCD_DIR=/root/.etcd
@@ -22,7 +21,6 @@ services:
     build:
       context: ../..
       dockerfile: Dockerfile-clustertests
-    image: ptest
     environment:
       - PILOSA_NAME=pilosa2
       - PILOSA_ETCD_DIR=/root/.etcd
@@ -40,7 +38,6 @@ services:
     build:
       context: ../..
       dockerfile: Dockerfile-clustertests
-    image: ptest
     environment:
       - PILOSA_NAME=pilosa3
       - PILOSA_ETCD_DIR=/root/.etcd
@@ -56,7 +53,8 @@ services:
       - "/featurebase server --bind pilosa3:10101 ${CLUSTERTESTS_FB_ARGS}"
   client1:
     build:
-      context: .
+      context: ../..
+      dockerfile: Dockerfile-clustertests-client
     depends_on:
         - "pilosa1"
         - "pilosa2"