Update docker file (#66)

* Update docker file

* Fix sha1 validation

* Update README for release

Author: Crim

Dockerfile

@@ -4,32 +4,37 @@ FROM openjdk:8-jre-alpine
 # Dockerfile author / maintainer
 MAINTAINER SourceLab.org <[email protected]>
 
-## Define version to install
-ENV WV_VER=1.0.5
+## Define what version of Kafka Webview to build the image using.
+ENV WEBVIEW_VER="1.0.5" \
+    WEBVIEW_SHA1="837e1ea4a91aeb44d65201311aa607ecf3347556" \
+    WEBVIEW_HOME="/app"
 
 # Create app and data directories
-RUN mkdir -p /app
-WORKDIR /app
-
-# Download latest distribution inside image
-# Extract package into /app stripping top level directory contained within the zip.
-RUN wget https://github.com/SourceLabOrg/kafka-webview/releases/download/v${WV_VER}/kafka-webview-ui-${WV_VER}-bin.zip && \
-    unzip -d /app kafka-webview-ui-*-bin.zip && \
-    rm -f /app/kafka-webview-ui-*-bin.zip && \
-    f=`ls` && \
-    mv /app/*/* /app && \
-    rmdir $f && \
-    rm -f /app/kafka-webview-ui-*-sources.jar && \
-    rm -f /app/kafka-webview-ui-*-javadoc.jar && \
-    apk add --update bash && \
+RUN mkdir -p ${WEBVIEW_HOME} && \
+    mkdir -p ${WEBVIEW_HOME}/logs && \
+    mkdir -p ${WEBVIEW_HOME}/data && \
+    apk add --update bash curl && \
     rm -rf /var/cache/apk/*
 
+WORKDIR ${WEBVIEW_HOME}
+
+# Download KafkaWebview Release from Github project
+RUN curl -fSL -o /tmp/kafka-webview-ui-bin.zip https://github.com/SourceLabOrg/kafka-webview/releases/download/v${WEBVIEW_VER}/kafka-webview-ui-${WEBVIEW_VER}-bin.zip
+
+# Verify SHA1 hash and extract.
+RUN echo "${WEBVIEW_SHA1}  /tmp/kafka-webview-ui-bin.zip" | sha1sum -c - && \
+    unzip -d ${WEBVIEW_HOME} /tmp/kafka-webview-ui-bin.zip && \
+    mv ${WEBVIEW_HOME}/kafka-webview-ui-${WEBVIEW_VER}/* ${WEBVIEW_HOME} && \
+    rm -rf ${WEBVIEW_HOME}/kafka-webview-ui-${WEBVIEW_VER}/ && \
+    rm -f ${WEBVIEW_HOME}/kafka-webview-ui-${WEBVIEW_VER}-sources.jar && \
+    rm -f ${WEBVIEW_HOME}/kafka-webview-ui-${WEBVIEW_VER}-javadoc.jar && \
+    rm -f /tmp/kafka-webview-ui-bin.zip
+
 # Create volume to persist data
-VOLUME /app/data
+VOLUME ${WEBVIEW_HOME}/data
 
 # Expose port
 EXPOSE 8080
 
 # What to run when the container starts
-ENTRYPOINT [ "/app/start.sh" ]
-
+ENTRYPOINT [ "/app/start.sh" ]

README.md

@@ -158,11 +158,12 @@ Steps for performing a release:
 5. Deploy to Maven Central: mvn clean deploy -P release-kafka-webview
 6. Create release on Github project.
 7 Build and upload new Docker images:
+    - Edit Dockerfile and update version and sha1 hash.
     - `docker build -t kafka-webview .`
     - `docker tag kafka-webview sourcelaborg/kafka-webview:latest`
     - `docker push sourcelaborg/kafka-webview:latest`
-    - `docker tag kafka-webview sourcelaborg/kafka-webview:1.0.VERSIONHERE`
-    - `docker push sourcelaborg/kafka-webview:1.0.VERSIONHERE`
+    - `docker tag kafka-webview sourcelaborg/kafka-webview:2.0.VERSIONHERE`
+    - `docker push sourcelaborg/kafka-webview:2.0.VERSIONHERE`
 
 
 # Changelog