From 1420e79ca756fb6b971f8b9c78f8640b078e30bd Mon Sep 17 00:00:00 2001
From: David Turanski <dturanski@pivotal.io>
Date: Thu, 4 Jun 2020 09:15:17 -0400
Subject: [PATCH] Fix Dockerfile

---
 .../src/main/resources/geode/Dockerfile       | 75 +------------------
 1 file changed, 2 insertions(+), 73 deletions(-)

diff --git a/common/function-test-support/src/main/resources/geode/Dockerfile b/common/function-test-support/src/main/resources/geode/Dockerfile
index 8f71755e..df5847e5 100644
--- a/common/function-test-support/src/main/resources/geode/Dockerfile
+++ b/common/function-test-support/src/main/resources/geode/Dockerfile
@@ -14,80 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM openjdk:8-jre-alpine
+FROM apachegeode/geode:1.12.0
 
-# runtime dependencies
-RUN apk add --no-cache \
-		bash \
-		ncurses
-
-# pub   4096R/ABF4396F 2018-04-12 [expires: 2022-04-12]
-#       8763 31B4 5A97 E382 D1BD  FB44 4482 0F9C ABF4 396F
-# uid       [  undef ] Mike Stolz <mikestolz@apache.org>
-# sub   4096R/3871E6AD 2018-04-12 [expires: 2022-04-12]
-ENV GEODE_GPG D2AE0CA42736AA78E473774DEBC77DA34AADD408
-# TODO does this change per-release like other Apache projects? (and thus needs to be a list of full fingerprints from a KEYS file instead?)
-
-ENV GEODE_HOME /geode
-ENV PATH $PATH:$GEODE_HOME/bin
-
-# https://geode.apache.org/releases/
-ENV GEODE_VERSION 1.12.0
-# Binaries TGZ SHA-256
-# https://dist.apache.org/repos/dist/release/geode/VERSION/apache-geode-VERSION.tgz.sha256
-ENV GEODE_SHA256 063b473dac914aca53c09326487cc96c63ef84eecc8b053c8cc3d5110e82f179
-
-# http://apache.org/dyn/closer.cgi/geode/1.3.0/apache-geode-1.3.0.tgz
-
-RUN set -eux; \
-	apk add --no-cache --virtual .fetch-deps \
-		libressl \
-		gnupg \
-	; \
-	for file in \
-		"geode/$GEODE_VERSION/apache-geode-$GEODE_VERSION.tgz" \
-		"geode/$GEODE_VERSION/apache-geode-$GEODE_VERSION.tgz.asc" \
-	; do \
-		target="$(basename "$file")"; \
-		for url in \
-# https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
-			"https://www.apache.org/dyn/closer.cgi?action=download&filename=$file" \
-			"https://www-us.apache.org/dist/$file" \
-			"https://www.apache.org/dist/$file" \
-			"https://archive.apache.org/dist/$file" \
-		; do \
-			if wget -O "$target" "$url"; then \
-				break; \
-			fi; \
-		done; \
-	done; \
-	[ -s "apache-geode-$GEODE_VERSION.tgz" ]; \
-	[ -s "apache-geode-$GEODE_VERSION.tgz.asc" ]; \
-	echo "$GEODE_SHA256 *apache-geode-$GEODE_VERSION.tgz" | sha256sum -c -; \
-	export GNUPGHOME="$(mktemp -d)"; \
-	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GEODE_GPG"; \
-	gpg --batch --verify "apache-geode-$GEODE_VERSION.tgz.asc" "apache-geode-$GEODE_VERSION.tgz"; \
-	rm -rf "$GNUPGHOME"; \
-	mkdir /geode; \
-	tar --extract \
-		--file "apache-geode-$GEODE_VERSION.tgz" \
-		--directory /geode \
-		--strip-components 1 \
-	; \
-	rm -rf /geode/javadoc "apache-geode-$GEODE_VERSION.tgz" "apache-geode-$GEODE_VERSION.tgz.asc"; \
-	apk del .fetch-deps; \
-# smoke test to ensure the shell can still run properly after removing temporary deps
-	gfsh version
-
-# Default ports:
-# RMI/JMX 1099
-# REST 8080
-# PULSE 7070
-# LOCATOR 10334
-# CACHESERVER 40404
 ARG CACHE_SERVER_PORT=40404
 ARG LOCATOR_PORT=10334
 
-EXPOSE  8080 ${LOCATOR_PORT} ${CACHE_SERVER_PORT} 1099 7070
-VOLUME ["/data"]
-#CMD ["gfsh"]
\ No newline at end of file
+EXPOSE ${LOCATOR_PORT} ${CACHE_SERVER_PORT}