Modify the GCP images to use debian-base (closes #52)

snowplow-archive · Jun 18, 2018 · 0709298 · 0709298
1 parent 4b00d35
commit 0709298
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 17 deletions.
diff --git a/scala-stream-collector/0.13.0/google-pubsub/Dockerfile b/scala-stream-collector/0.13.0/google-pubsub/Dockerfile
@@ -1,4 +1,4 @@
-FROM snowplow-docker-registry.bintray.io/snowplow/base:0.1.0
+FROM snowplow-docker-registry.bintray.io/snowplow/base-debian:0.1.0
 LABEL maintainer="Snowplow Analytics Ltd. <[email protected]>"
 
 # The version of the collector to download.

diff --git a/scala-stream-collector/0.13.0/google-pubsub/docker-entrypoint.sh b/scala-stream-collector/0.13.0/google-pubsub/docker-entrypoint.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/dumb-init /bin/sh
+#!/usr/bin/dumb-init /bin/bash
 set -e
 
 # If the config directory has been mounted through -v, we chown it.
@@ -7,6 +7,6 @@ if [ "$(stat -c %u ${SNOWPLOW_CONFIG_PATH})" != "$(id -u snowplow)" ]; then
 fi
 
 # Make sure we run the collector as the snowplow user
-exec su-exec snowplow:snowplow /usr/bin/java \
+exec gosu snowplow:snowplow /usr/bin/java \
   $SP_JAVA_OPTS -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap \
   -jar ${SNOWPLOW_BIN_PATH}/snowplow-stream-collector-${PLATFORM//_/-}-${COLLECTOR_VERSION}.jar "$@"
diff --git a/scala-stream-collector/README.md b/scala-stream-collector/README.md
@@ -12,7 +12,8 @@ There is one image per targeted platform:
 ## Introduction
 
 This image is based on [the base image][base-image] which leverages
-[the Java 8 Alpine image][alpine-image].
+[the Java 8 Alpine image][alpine-image] (the Google PubSub image leverages
+[the Java 8 Debian image][debian-image] due to incompatibilities with Alpine).
 
 The Scala Stream Collector runs under [dumb-init][dumb-init] which handles reaping zombie processes
 and forwards signals on to all processes running in the container. This image also uses
@@ -86,6 +87,7 @@ limitations under the License.
 [base-image]: https://github.com/snowplow/snowplow-docker/tree/master/base
 [docker-compose-example]: https://github.com/snowplow/snowplow-docker/tree/master/example
 [alpine-image]: https://github.com/docker-library/openjdk/blob/master/8-jre/alpine/Dockerfile
+[debian-image]: https://github.com/docker-library/openjdk/blob/master/8-jre/slim/Dockerfile
 
 [ssc]: https://github.com/snowplow/snowplow/tree/master/2-collectors/scala-stream-collector
 [dumb-init]: https://github.com/Yelp/dumb-init

diff --git a/stream-enrich/0.15.0/google-pubsub/Dockerfile b/stream-enrich/0.15.0/google-pubsub/Dockerfile
@@ -1,4 +1,4 @@
-FROM snowplow-docker-registry.bintray.io/snowplow/base:0.1.0
+FROM snowplow-docker-registry.bintray.io/snowplow/base-debian:0.1.0
 LABEL maintainer="Snowplow Analytics Ltd. <[email protected]>"
 
 # The version of stream enrich to download.

diff --git a/stream-enrich/0.15.0/google-pubsub/docker-entrypoint.sh b/stream-enrich/0.15.0/google-pubsub/docker-entrypoint.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/dumb-init /bin/sh
+#!/usr/bin/dumb-init /bin/bash
 set -e
 
 # If the config directory has been mounted through -v, we chown it.
@@ -10,6 +10,6 @@ fi
 cd $(eval echo ~snowplow)
 
 # Make sure we run the collector as the snowplow user
-exec su-exec snowplow:snowplow /usr/bin/java \
+exec gosu snowplow:snowplow /usr/bin/java \
   $SP_JAVA_OPTS -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap \
   -jar ${SNOWPLOW_BIN_PATH}/snowplow-stream-enrich-${PLATFORM//_/-}-${ENRICH_VERSION}.jar "$@"
diff --git a/stream-enrich/0.16.0/google-pubsub/Dockerfile b/stream-enrich/0.16.0/google-pubsub/Dockerfile
@@ -1,4 +1,4 @@
-FROM snowplow-docker-registry.bintray.io/snowplow/base:0.1.0
+FROM snowplow-docker-registry.bintray.io/snowplow/base-debian:0.1.0
 LABEL maintainer="Snowplow Analytics Ltd. <[email protected]>"
 
 # The version of stream enrich to download.

diff --git a/stream-enrich/0.16.0/google-pubsub/docker-entrypoint.sh b/stream-enrich/0.16.0/google-pubsub/docker-entrypoint.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/dumb-init /bin/sh
+#!/usr/bin/dumb-init /bin/bash
 set -e
 
 # If the config directory has been mounted through -v, we chown it.
@@ -10,6 +10,6 @@ fi
 cd $(eval echo ~snowplow)
 
 # Make sure we run the collector as the snowplow user
-exec su-exec snowplow:snowplow /usr/bin/java \
+exec gosu snowplow:snowplow /usr/bin/java \
   $SP_JAVA_OPTS -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap \
   -jar ${SNOWPLOW_BIN_PATH}/snowplow-stream-enrich-${PLATFORM//_/-}-${ENRICH_VERSION}.jar "$@"
diff --git a/stream-enrich/0.16.1/google-pubsub/Dockerfile b/stream-enrich/0.16.1/google-pubsub/Dockerfile
@@ -1,4 +1,4 @@
-FROM snowplow-docker-registry.bintray.io/snowplow/base:0.1.0
+FROM snowplow-docker-registry.bintray.io/snowplow/base-debian:0.1.0
 LABEL maintainer="Snowplow Analytics Ltd. <[email protected]>"
 
 # The version of stream enrich to download.

diff --git a/stream-enrich/0.16.1/google-pubsub/docker-entrypoint.sh b/stream-enrich/0.16.1/google-pubsub/docker-entrypoint.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/dumb-init /bin/sh
+#!/usr/bin/dumb-init /bin/bash
 set -e
 
 # If the config directory has been mounted through -v, we chown it.
@@ -10,6 +10,6 @@ fi
 cd $(eval echo ~snowplow)
 
 # Make sure we run the collector as the snowplow user
-exec su-exec snowplow:snowplow /usr/bin/java \
+exec gosu snowplow:snowplow /usr/bin/java \
   $SP_JAVA_OPTS -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap \
   -jar ${SNOWPLOW_BIN_PATH}/snowplow-stream-enrich-${PLATFORM//_/-}-${ENRICH_VERSION}.jar "$@"
diff --git a/stream-enrich/0.17.0/google-pubsub/Dockerfile b/stream-enrich/0.17.0/google-pubsub/Dockerfile
@@ -1,4 +1,4 @@
-FROM snowplow-docker-registry.bintray.io/snowplow/base:0.1.0
+FROM snowplow-docker-registry.bintray.io/snowplow/base-debian:0.1.0
 LABEL maintainer="Snowplow Analytics Ltd. <[email protected]>"
 
 # The version of stream enrich to download.

diff --git a/stream-enrich/0.17.0/google-pubsub/docker-entrypoint.sh b/stream-enrich/0.17.0/google-pubsub/docker-entrypoint.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/dumb-init /bin/sh
+#!/usr/bin/dumb-init /bin/bash
 set -e
 
 # If the config directory has been mounted through -v, we chown it.
@@ -10,6 +10,6 @@ fi
 cd $(eval echo ~snowplow)
 
 # Make sure we run the collector as the snowplow user
-exec su-exec snowplow:snowplow /usr/bin/java \
+exec gosu snowplow:snowplow /usr/bin/java \
   $SP_JAVA_OPTS -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap \
   -jar ${SNOWPLOW_BIN_PATH}/snowplow-stream-enrich-${PLATFORM//_/-}-${ENRICH_VERSION}.jar "$@"
diff --git a/stream-enrich/README.md b/stream-enrich/README.md
@@ -12,7 +12,8 @@ There is one image per targeted platform:
 ## Introduction
 
 This image is based on [the base image][base-image] which leverages
-[the Java 8 Alpine image][alpine-image].
+[the Java 8 Alpine image][alpine-image] (the Google PubSub image leverages
+[the Java 8 Debian image][debian-image] due to incompatibilities with Alpine).
 
 Stream Enrich runs under [dumb-init][dumb-init] which handles reaping zombie processes
 and forwards signals on to all processes running in the container. This image also uses
@@ -94,6 +95,7 @@ limitations under the License.
 [base-image]: https://github.com/snowplow/snowplow-docker/tree/master/base
 [docker-compose-example]: https://github.com/snowplow/snowplow-docker/tree/master/example
 [alpine-image]: https://github.com/docker-library/openjdk/blob/master/8-jre/alpine/Dockerfile
+[debian-image]: https://github.com/docker-library/openjdk/blob/master/8-jre/slim/Dockerfile
 
 [stream-enrich]: https://github.com/snowplow/snowplow/tree/master/3-enrich/stream-enrich
 [dumb-init]: https://github.com/Yelp/dumb-init