Merge branch 'release-5'

.travis.yml

@@ -14,10 +14,10 @@ env:
   - IMG=scala-stream-collector/0.13.0/kafka
   - IMG=scala-stream-collector/0.13.0/kinesis
   - IMG=scala-stream-collector/0.13.0/nsq
-  - IMG=stream-enrich/0.16.0/google-pubsub
-  - IMG=stream-enrich/0.16.0/kafka
-  - IMG=stream-enrich/0.16.0/kinesis
-  - IMG=stream-enrich/0.16.0/nsq
+  - IMG=stream-enrich/0.16.1/google-pubsub
+  - IMG=stream-enrich/0.16.1/kafka
+  - IMG=stream-enrich/0.16.1/kinesis
+  - IMG=stream-enrich/0.16.1/nsq
   - IMG=s3-loader/0.6.0
   - IMG=elasticsearch-loader/0.10.1
   - IMG=iglu-server/0.3.0

CHANGELOG

@@ -1,3 +1,7 @@
+Release 5 (2018-05-09)
+----------------------
+Add Stream Enrich 0.16.1 image (#46) 
+
 Release 4 (2018-04-20)
 ----------------------
 Add Dockerfile for Iglu Server (#2)

README.md

@@ -24,7 +24,7 @@ You can pull the images from the registry directly:
 docker pull snowplow-docker-registry.bintray.io/snowplow/scala-stream-collector-nsq:0.13.0
 
 # NSQ Stream Enrich image, there are others available for Kinesis, Kafka and Google PubSub
-docker pull snowplow-docker-registry.bintray.io/snowplow/stream-enrich-nsq:0.16.0
+docker pull snowplow-docker-registry.bintray.io/snowplow/stream-enrich-nsq:0.16.1
 
 # Elasticsearch Loader image
 docker pull snowplow-docker-registry.bintray.io/snowplow/elasticsearch-loader:0.10.1
@@ -48,7 +48,7 @@ docker pull snowplow-docker-registry.bintray.io/snowplow/base:0.1.0
 docker build -t snowplow/scala-stream-collector-nsq:0.13.0 scala-stream-collector/0.13.0/nsq
 
 # NSQ Stream Enrich image, there are others available for Kinesis, Kafka and Google PubSub
-docker build -t snowplow/stream-enrich-nsq:0.16.0 stream-enrich/0.16.0/nsq
+docker build -t snowplow/stream-enrich-nsq:0.16.1 stream-enrich/0.16.1/nsq
 
 # Elasticsearch Loader image
 docker build -t snowplow/elasticsearch-loader:0.10.1 elasticsearch-loader/0.10.1
@@ -84,8 +84,8 @@ docker run \
 # NSQ Stream Enrich container, there are others available for Kinesis, Kafka and Google PubSub
 docker run \
   -v $PWD/stream-enrich-config:/snowplow/config \
-  snowplow/stream-enrich-nsq:0.16.0 \ # if you have built the image
-  # snowplow-docker-registry.bintray.io/snowplow/stream-enrich-nsq:0.16.0 if you have pulled the image
+  snowplow/stream-enrich-nsq:0.16.1 \ # if you have built the image
+  # snowplow-docker-registry.bintray.io/snowplow/stream-enrich-nsq:0.16.1 if you have pulled the image
   --config /snowplow/config/config.hocon \
   --resolver file:/snowplow/config/resolver.json \
   --enrichments file:/snowplow/config/enrichments/ \

stream-enrich/0.11.1/Dockerfile

@@ -1,7 +1,7 @@
 FROM snowplow-docker-registry.bintray.io/snowplow/base:0.1.0
 LABEL maintainer="Snowplow Analytics Ltd. <[email protected]>"
 
-# The version of the collector to download.
+# The version of stream enrich to download.
 ENV ENRICH_VERSION="0.11.1"
 
 # The name of the archive to download.

stream-enrich/0.12.0/Dockerfile

@@ -1,7 +1,7 @@
 FROM snowplow-docker-registry.bintray.io/snowplow/base:0.1.0
 LABEL maintainer="Snowplow Analytics Ltd. <[email protected]>"
 
-# The version of the collector to download.
+# The version of stream enrich to download.
 ENV ENRICH_VERSION="0.12.0"
 
 # The name of the archive to download.

stream-enrich/0.13.0/Dockerfile

@@ -1,7 +1,7 @@
 FROM snowplow-docker-registry.bintray.io/snowplow/base:0.1.0
 LABEL maintainer="Snowplow Analytics Ltd. <[email protected]>"
 
-# The version of the collector to download.
+# The version of stream enrich to download.
 ENV ENRICH_VERSION="0.13.0"
 
 # The name of the archive to download.

stream-enrich/0.14.0/Dockerfile

@@ -1,7 +1,7 @@
 FROM snowplow-docker-registry.bintray.io/snowplow/base:0.1.0
 LABEL maintainer="Snowplow Analytics Ltd. <[email protected]>"
 
-# The version of the collector to download.
+# The version of stream enrich to download.
 ENV ENRICH_VERSION="0.14.0"
 
 # The name of the archive to download.

stream-enrich/0.15.0/google-pubsub/Dockerfile

@@ -1,7 +1,7 @@
 FROM snowplow-docker-registry.bintray.io/snowplow/base:0.1.0
 LABEL maintainer="Snowplow Analytics Ltd. <[email protected]>"
 
-# The version of the collector to download.
+# The version of stream enrich to download.
 ENV ENRICH_VERSION="0.15.0"
 
 # The targeted platform

stream-enrich/0.15.0/kafka/Dockerfile

@@ -1,7 +1,7 @@
 FROM snowplow-docker-registry.bintray.io/snowplow/base:0.1.0
 LABEL maintainer="Snowplow Analytics Ltd. <[email protected]>"
 
-# The version of the collector to download.
+# The version of stream enrich to download.
 ENV ENRICH_VERSION="0.15.0"
 
 # The targeted platform

stream-enrich/0.15.0/kinesis/Dockerfile

@@ -1,7 +1,7 @@
 FROM snowplow-docker-registry.bintray.io/snowplow/base:0.1.0
 LABEL maintainer="Snowplow Analytics Ltd. <[email protected]>"
 
-# The version of the collector to download.
+# The version of stream enrich to download.
 ENV ENRICH_VERSION="0.15.0"
 
 # The targeted platform

stream-enrich/0.15.0/nsq/Dockerfile

@@ -1,7 +1,7 @@
 FROM snowplow-docker-registry.bintray.io/snowplow/base:0.1.0
 LABEL maintainer="Snowplow Analytics Ltd. <[email protected]>"
 
-# The version of the collector to download.
+# The version of stream enrich to download.
 ENV ENRICH_VERSION="0.15.0"
 
 # The targeted platform

stream-enrich/0.16.0/google-pubsub/Dockerfile

@@ -1,7 +1,7 @@
 FROM snowplow-docker-registry.bintray.io/snowplow/base:0.1.0
 LABEL maintainer="Snowplow Analytics Ltd. <[email protected]>"
 
-# The version of the collector to download.
+# The version of stream enrich to download.
 ENV ENRICH_VERSION="0.16.0"
 
 # The targeted platform

stream-enrich/0.16.0/kafka/Dockerfile

@@ -1,7 +1,7 @@
 FROM snowplow-docker-registry.bintray.io/snowplow/base:0.1.0
 LABEL maintainer="Snowplow Analytics Ltd. <[email protected]>"
 
-# The version of the collector to download.
+# The version of stream enrich to download.
 ENV ENRICH_VERSION="0.16.0"
 
 # The targeted platform

stream-enrich/0.16.0/kinesis/Dockerfile

@@ -1,7 +1,7 @@
 FROM snowplow-docker-registry.bintray.io/snowplow/base:0.1.0
 LABEL maintainer="Snowplow Analytics Ltd. <[email protected]>"
 
-# The version of the collector to download.
+# The version of stream enrich to download.
 ENV ENRICH_VERSION="0.16.0"
 
 # The targeted platform

stream-enrich/0.16.0/nsq/Dockerfile

@@ -1,7 +1,7 @@
 FROM snowplow-docker-registry.bintray.io/snowplow/base:0.1.0
 LABEL maintainer="Snowplow Analytics Ltd. <[email protected]>"
 
-# The version of the collector to download.
+# The version of stream enrich to download.
 ENV ENRICH_VERSION="0.16.0"
 
 # The targeted platform

stream-enrich/0.16.1/google-pubsub/Dockerfile

@@ -0,0 +1,26 @@
+FROM snowplow-docker-registry.bintray.io/snowplow/base:0.1.0
+LABEL maintainer="Snowplow Analytics Ltd. <[email protected]>"
+
+# The version of stream enrich to download.
+ENV ENRICH_VERSION="0.16.1"
+
+# The targeted platform
+ENV PLATFORM="google_pubsub"
+
+# The name of the archive to download.
+ENV ARCHIVE="snowplow_stream_enrich_${PLATFORM}_${ENRICH_VERSION}.zip"
+
+# Install the Scala Stream Collector.
+RUN mkdir -p /tmp/build && \
+    cd /tmp/build && \
+    wget -q http://dl.bintray.com/snowplow/snowplow-generic/${ARCHIVE} && \
+    unzip -d ${SNOWPLOW_BIN_PATH} ${ARCHIVE} && \
+    cd /tmp && \
+    rm -rf /tmp/build
+
+# Defines an entrypoint script delegating the lauching of stream enrich to the snowplow user.
+# The script uses dumb-init as the top-level process.
+COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+ENTRYPOINT [ "docker-entrypoint.sh" ]
+
+CMD [ "--help" ]

stream-enrich/0.16.1/google-pubsub/docker-entrypoint.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/dumb-init /bin/sh
+set -e
+
+# If the config directory has been mounted through -v, we chown it.
+if [ "$(stat -c %u ${SNOWPLOW_CONFIG_PATH})" != "$(id -u snowplow)" ]; then
+  chown snowplow:snowplow ${SNOWPLOW_CONFIG_PATH}
+fi
+
+# Needed because of SCE's ./ip_geo file
+cd $(eval echo ~snowplow)
+
+# Make sure we run the collector as the snowplow user
+exec su-exec snowplow:snowplow /usr/bin/java \
+  $SP_JAVA_OPTS -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap \
+  -jar ${SNOWPLOW_BIN_PATH}/snowplow-stream-enrich-${PLATFORM//_/-}-${ENRICH_VERSION}.jar "$@"

stream-enrich/0.16.1/kafka/Dockerfile

@@ -0,0 +1,26 @@
+FROM snowplow-docker-registry.bintray.io/snowplow/base:0.1.0
+LABEL maintainer="Snowplow Analytics Ltd. <[email protected]>"
+
+# The version of stream enrich to download.
+ENV ENRICH_VERSION="0.16.1"
+
+# The targeted platform
+ENV PLATFORM="kafka"
+
+# The name of the archive to download.
+ENV ARCHIVE="snowplow_stream_enrich_${PLATFORM}_${ENRICH_VERSION}.zip"
+
+# Install the Scala Stream Collector.
+RUN mkdir -p /tmp/build && \
+    cd /tmp/build && \
+    wget -q http://dl.bintray.com/snowplow/snowplow-generic/${ARCHIVE} && \
+    unzip -d ${SNOWPLOW_BIN_PATH} ${ARCHIVE} && \
+    cd /tmp && \
+    rm -rf /tmp/build
+
+# Defines an entrypoint script delegating the lauching of stream enrich to the snowplow user.
+# The script uses dumb-init as the top-level process.
+COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+ENTRYPOINT [ "docker-entrypoint.sh" ]
+
+CMD [ "--help" ]

stream-enrich/0.16.1/kafka/docker-entrypoint.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/dumb-init /bin/sh
+set -e
+
+# If the config directory has been mounted through -v, we chown it.
+if [ "$(stat -c %u ${SNOWPLOW_CONFIG_PATH})" != "$(id -u snowplow)" ]; then
+  chown snowplow:snowplow ${SNOWPLOW_CONFIG_PATH}
+fi
+
+# Needed because of SCE's ./ip_geo file
+cd $(eval echo ~snowplow)
+
+# Make sure we run the collector as the snowplow user
+exec su-exec snowplow:snowplow /usr/bin/java \
+  $SP_JAVA_OPTS -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap \
+  -jar ${SNOWPLOW_BIN_PATH}/snowplow-stream-enrich-${PLATFORM}-${ENRICH_VERSION}.jar "$@"

stream-enrich/0.16.1/kinesis/Dockerfile

@@ -0,0 +1,26 @@
+FROM snowplow-docker-registry.bintray.io/snowplow/base:0.1.0
+LABEL maintainer="Snowplow Analytics Ltd. <[email protected]>"
+
+# The version of stream enrich to download.
+ENV ENRICH_VERSION="0.16.1"
+
+# The targeted platform
+ENV PLATFORM="kinesis"
+
+# The name of the archive to download.
+ENV ARCHIVE="snowplow_stream_enrich_${PLATFORM}_${ENRICH_VERSION}.zip"
+
+# Install the Scala Stream Collector.
+RUN mkdir -p /tmp/build && \
+    cd /tmp/build && \
+    wget -q http://dl.bintray.com/snowplow/snowplow-generic/${ARCHIVE} && \
+    unzip -d ${SNOWPLOW_BIN_PATH} ${ARCHIVE} && \
+    cd /tmp && \
+    rm -rf /tmp/build
+
+# Defines an entrypoint script delegating the lauching of stream enrich to the snowplow user.
+# The script uses dumb-init as the top-level process.
+COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+ENTRYPOINT [ "docker-entrypoint.sh" ]
+
+CMD [ "--help" ]

stream-enrich/0.16.1/kinesis/docker-entrypoint.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/dumb-init /bin/sh
+set -e
+
+# If the config directory has been mounted through -v, we chown it.
+if [ "$(stat -c %u ${SNOWPLOW_CONFIG_PATH})" != "$(id -u snowplow)" ]; then
+  chown snowplow:snowplow ${SNOWPLOW_CONFIG_PATH}
+fi
+
+# Needed because of SCE's ./ip_geo file
+cd $(eval echo ~snowplow)
+
+# Make sure we run the collector as the snowplow user
+exec su-exec snowplow:snowplow /usr/bin/java \
+  $SP_JAVA_OPTS -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap \
+  -jar ${SNOWPLOW_BIN_PATH}/snowplow-stream-enrich-${PLATFORM}-${ENRICH_VERSION}.jar "$@"

stream-enrich/0.16.1/nsq/Dockerfile

@@ -0,0 +1,26 @@
+FROM snowplow-docker-registry.bintray.io/snowplow/base:0.1.0
+LABEL maintainer="Snowplow Analytics Ltd. <[email protected]>"
+
+# The version of stream enrich to download.
+ENV ENRICH_VERSION="0.16.1"
+
+# The targeted platform
+ENV PLATFORM="nsq"
+
+# The name of the archive to download.
+ENV ARCHIVE="snowplow_stream_enrich_${PLATFORM}_${ENRICH_VERSION}.zip"
+
+# Install the Scala Stream Collector.
+RUN mkdir -p /tmp/build && \
+    cd /tmp/build && \
+    wget -q http://dl.bintray.com/snowplow/snowplow-generic/${ARCHIVE} && \
+    unzip -d ${SNOWPLOW_BIN_PATH} ${ARCHIVE} && \
+    cd /tmp && \
+    rm -rf /tmp/build
+
+# Defines an entrypoint script delegating the lauching of stream enrich to the snowplow user.
+# The script uses dumb-init as the top-level process.
+COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+ENTRYPOINT [ "docker-entrypoint.sh" ]
+
+CMD [ "--help" ]

stream-enrich/0.16.1/nsq/docker-entrypoint.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/dumb-init /bin/sh
+set -e
+
+# If the config directory has been mounted through -v, we chown it.
+if [ "$(stat -c %u ${SNOWPLOW_CONFIG_PATH})" != "$(id -u snowplow)" ]; then
+  chown snowplow:snowplow ${SNOWPLOW_CONFIG_PATH}
+fi
+
+# Needed because of SCE's ./ip_geo file
+cd $(eval echo ~snowplow)
+
+# Make sure we run the collector as the snowplow user
+exec su-exec snowplow:snowplow /usr/bin/java \
+  $SP_JAVA_OPTS -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap \
+  -jar ${SNOWPLOW_BIN_PATH}/snowplow-stream-enrich-${PLATFORM}-${ENRICH_VERSION}.jar "$@"

stream-enrich/README.md

@@ -32,7 +32,7 @@ Additional JVM options can be set through the `SP_JAVA_OPTS` environment variabl
 Running the container without arguments will print out its usage:
 
 ```bash
-$ VERSION=0.16.0
+$ VERSION=0.16.1
 $ docker run snowplow-docker-registry.bintray.io/snowplow/stream-enrich-nsq:${VERSION}
 
 snowplow-stream-enrich $VERSION