From 5c7f039861571c88b06d2e84fcde811107fe6ffd Mon Sep 17 00:00:00 2001
From: Ryan Kennedy <47543687+rkennedy-mode@users.noreply.github.com>
Date: Tue, 7 Sep 2021 14:26:34 -0700
Subject: [PATCH 1/5] Disable memory checking on dist'd builds

Hopefully gets rid of the following message (as well as any performance penalties we may be paying):

> WARN: Strict java memory checking is enabled, don't do release builds or performance runs with this enabled. Invoke "ant clean" and "ant -Djmemcheck=NO_MEMCHECK" to disable.
---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d4136ac4503..9310515fe05 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,7 +28,7 @@ jobs:
       - run: apt-get install -y openjdk-8-jdk-headless ant build-essential cmake python git
       - checkout
       - run: ant clean
-      - run: ant dist
+      - run: ant -Djmemcheck=NO_MEMCHECK dist
       - run: cp obj/release/voltdb-community-*.tar.gz obj/release/mode-voltdb-community.tar.gz
       - store_artifacts:
           path: obj/release/mode-voltdb-community.tar.gz

From 41d5ff585d42eee40fbf9b4904e18d4a3ef64a54 Mon Sep 17 00:00:00 2001
From: Ryan Kennedy <47543687+rkennedy-mode@users.noreply.github.com>
Date: Tue, 7 Sep 2021 14:31:17 -0700
Subject: [PATCH 2/5] Disable memory checking in the Docker image, too

---
 .circleci/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/docker/Dockerfile b/.circleci/docker/Dockerfile
index 23eb6b9d050..98a01bc48e3 100644
--- a/.circleci/docker/Dockerfile
+++ b/.circleci/docker/Dockerfile
@@ -15,7 +15,7 @@ WORKDIR /opt/voltdb
 COPY . .
 
 RUN ant clean
-RUN ant dist | ts '[%Y-%m-%d %H:%M:%S]'
+RUN ant -Djmemcheck=NO_MEMCHECK dist | ts '[%Y-%m-%d %H:%M:%S]'
 RUN cp obj/release/voltdb-community-*.tar.gz obj/release/voltdb-community.tar.gz
 
 

From 36f3fefc462e066ee18c56d8d125be2a64da24f8 Mon Sep 17 00:00:00 2001
From: Ryan Kennedy <47543687+rkennedy-mode@users.noreply.github.com>
Date: Tue, 7 Sep 2021 15:25:27 -0700
Subject: [PATCH 3/5] Supersize the `dist` job container size

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9310515fe05..3f945f37066 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,7 +20,7 @@ workflows:
 jobs:
 
   dist:
-    resource_class: xlarge
+    resource_class: 2xlarge
     docker:
       - image: ubuntu:16.04
     steps:

From 29a152a4f4d7511b784721ee8d77ff34a2e0739e Mon Sep 17 00:00:00 2001
From: Ryan Kennedy <47543687+rkennedy-mode@users.noreply.github.com>
Date: Tue, 7 Sep 2021 15:33:46 -0700
Subject: [PATCH 4/5] Put `dist` job resources back on `xlarge`

It didn't help
---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3f945f37066..9310515fe05 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,7 +20,7 @@ workflows:
 jobs:
 
   dist:
-    resource_class: 2xlarge
+    resource_class: xlarge
     docker:
       - image: ubuntu:16.04
     steps:

From 29708815499c03ac6b67e6de0ac7eb01afbd2c51 Mon Sep 17 00:00:00 2001
From: Ryan Kennedy <47543687+rkennedy-mode@users.noreply.github.com>
Date: Tue, 7 Sep 2021 16:37:35 -0700
Subject: [PATCH 5/5] Add `-y` argument when apt installing `docker-ce-cli`

Without this the Docker image build hangs indefinitely, waiting for someone to answer the question:

> Do you want to continue? [Y/n]
---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9310515fe05..40aa2632ed5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -98,7 +98,7 @@ commands:
             apt-key fingerprint 0EBFCD88
             add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
             apt-get update
-            apt-get install docker-ce-cli
+            apt-get install -y docker-ce-cli
       - checkout
       - setup_remote_docker:
           docker_layer_caching: true