From a2280e8f0a6c4ad8a34453f74bcc0d01c28a53b5 Mon Sep 17 00:00:00 2001
From: Jeremy Sawicki <jeremy-icfp2020@sawicki.us>
Date: Sun, 5 Jul 2020 14:10:55 -0700
Subject: [PATCH] Standardize dockerfiles: C++

---
 dockerfiles/cpp/Dockerfile                         | 14 ++++----------
 .../cpp/{Dockerfile.build.base => Dockerfile.base} |  0
 dockerfiles/cpp/Dockerfile.run.base                |  7 -------
 3 files changed, 4 insertions(+), 17 deletions(-)
 rename dockerfiles/cpp/{Dockerfile.build.base => Dockerfile.base} (100%)
 delete mode 100644 dockerfiles/cpp/Dockerfile.run.base

diff --git a/dockerfiles/cpp/Dockerfile b/dockerfiles/cpp/Dockerfile
index d62c182..54ec6cf 100644
--- a/dockerfiles/cpp/Dockerfile
+++ b/dockerfiles/cpp/Dockerfile
@@ -1,12 +1,6 @@
-FROM icfpcontest2020/cpp-build:latest AS build
-WORKDIR /source
+FROM icfpcontest2020/cpp
 
+WORKDIR /app
 COPY . .
-WORKDIR /source/app
-RUN mkdir /build
-RUN ./build
-
-FROM icfpcontest2020/cpp-run:latest
-WORKDIR /build
-COPY --from=build /build .
-ENTRYPOINT ["./run"]
+RUN ./build.sh
+ENTRYPOINT ["./run.sh"]
diff --git a/dockerfiles/cpp/Dockerfile.build.base b/dockerfiles/cpp/Dockerfile.base
similarity index 100%
rename from dockerfiles/cpp/Dockerfile.build.base
rename to dockerfiles/cpp/Dockerfile.base
diff --git a/dockerfiles/cpp/Dockerfile.run.base b/dockerfiles/cpp/Dockerfile.run.base
deleted file mode 100644
index 5a92d91..0000000
--- a/dockerfiles/cpp/Dockerfile.run.base
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM debian:buster-20200607-slim
-ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends apt-utils && \
-    apt-get install -y --no-install-recommends libcurl4 libjansson4 libgmp10 libgmpxx4ldbl libqt5core5a libqt5network5 libqt5gui5 libqt5xml5 libboost-atomic1.67.0 libboost-chrono1.67.0 libboost-container1.67.0 libboost-context1.67.0 libboost-contract1.67.0 libboost-coroutine1.67.0 libboost-date-time1.67.0 libboost-fiber1.67.0 libboost-filesystem1.67.0 libboost-graph-parallel1.67.0 libboost-graph1.67.0 libboost-iostreams1.67.0 libboost-locale1.67.0 libboost-log1.67.0 libboost-math1.67.0 libboost-mpi-python1.67.0 libboost-mpi1.67.0 libboost-numpy1.67.0 libboost-program-options1.67.0 libboost-python1.67.0 libboost-random1.67.0 libboost-regex1.67.0 libboost-serialization1.67.0 libboost-signals1.67.0 libboost-stacktrace1.67.0 libboost-system1.67.0 libboost-test1.67.0 libboost-thread1.67.0 libboost-timer1.67.0 libboost-type-erasure1.67.0 libboost-wave1.67.0 && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*