Merge pull request #21805 from danhhz/persist_cli_docker

persist: split out a maelstrom-persist-base mzimage

Author: danhhz

src/persist-cli/ci-base/Dockerfile

@@ -0,0 +1,25 @@
+# Copyright Materialize, Inc. and contributors. All rights reserved.
+#
+# Use of this software is governed by the Business Source License
+# included in the LICENSE file at the root of this repository.
+#
+# As of the Change Date specified in that file, in accordance with
+# the Business Source License, use of this software will be governed
+# by the Apache License, Version 2.0.
+
+# This is a separate mzimage from maelstrom-persist so that we don't have to
+# re-install the apt things or maelstrom every time we get a CI builder with a
+# cold cache.
+
+MZFROM ubuntu-base
+
+RUN apt-get update && TZ=UTC DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    bzip2 \
+    curl \
+    git \
+    gnuplot \
+    openjdk-11-jre
+
+RUN mkdir -p /usr/local/share/java \
+    && curl -fsSL https://github.com/jepsen-io/maelstrom/releases/download/v0.2.1/maelstrom.tar.bz2 \
+        | tar -xj --strip-components=2 -C /usr/local/share/java maelstrom/lib/maelstrom.jar

src/persist-cli/ci-base/mzbuild.yml

@@ -0,0 +1,10 @@
+# Copyright Materialize, Inc. and contributors. All rights reserved.
+#
+# Use of this software is governed by the Business Source License
+# included in the LICENSE file at the root of this repository.
+#
+# As of the Change Date specified in that file, in accordance with
+# the Business Source License, use of this software will be governed
+# by the Apache License, Version 2.0.
+
+name: maelstrom-persist-base

src/persist-cli/ci/Dockerfile

@@ -7,18 +7,7 @@
 # the Business Source License, use of this software will be governed
 # by the Apache License, Version 2.0.
 
-MZFROM ubuntu-base
-
-RUN apt-get update && TZ=UTC DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    bzip2 \
-    curl \
-    git \
-    gnuplot \
-    openjdk-11-jre
-
-RUN mkdir -p /usr/local/share/java \
-    && curl -fsSL https://github.com/jepsen-io/maelstrom/releases/download/v0.2.1/maelstrom.tar.bz2 \
-        | tar -xj --strip-components=2 -C /usr/local/share/java maelstrom/lib/maelstrom.jar
+MZFROM maelstrom-persist-base
 
 COPY persistcli /usr/local/bin/persistcli