Merge pull request #6 from databucket/cleanup

Cleanup

Author: klubi

README.md

@@ -64,10 +64,9 @@ Above command will create docker environment with two containers `databucket-app
 
 # Building images locally
 
-Databucket app is available for download at https://www.databucket.pl/download. Moreover, you can build jar file on your own before building docker image.
+Run one of below commands from repository root.
 
-Once image is build, must be placed in respective folder (ie: in `databucket-docker-alpine`).  
-Once jar file is in folder run one of below commands from repository root.
+## Linux/OS X
 
 |command|scope|
 |-|-|
@@ -80,6 +79,18 @@ Once jar file is in folder run one of below commands from repository root.
 |`make release_latest`|pushes latest images to docker-hub (requires respective credentials)|
 |`make release_version`|pushes versioned images to docker-hub (requires respective credentials)|
 
+## Windows
+
+```bash
+docker build -t databucket-app:2.2.5-alpine databucket-docker-alpine
+```
+
+or
+
+```bash
+docker build -t databucket-app:2.2.5-slim databucket-docker-slim
+```
+
 # Building images in TravisCI
 
-Not yet available, requires **databucket-app** jar to be published somewhere first...
+Comming soon.

databucket-docker-alpine/Dockerfile

@@ -13,12 +13,14 @@ ENV JAR_NAME databucket-app-2.2.5.jar
 RUN adduser spring --disabled-password --gecos ""
 
 RUN apk update && \
-    apk upgrade
+    apk upgrade && \
+    apk add ca-certificates wget && \
+    update-ca-certificates
 
 COPY /docker-entrypoint.sh /home/spring/docker-entrypoint.sh
 RUN chmod +x /home/spring/docker-entrypoint.sh
 
-COPY /${JAR_NAME} /home/spring/${JAR_NAME}
+RUN wget -O /home/spring/databucket-app-2.2.5.jar https://github.com/databucket/databucket-app/releases/download/2.2.5/databucket-app-2.2.5.jar
 RUN chown spring:spring /home/spring/${JAR_NAME}
 
 USER spring

databucket-docker-slim/Dockerfile

@@ -13,12 +13,13 @@ ENV JAR_NAME databucket-app-2.2.5.jar
 RUN adduser spring --disabled-password --gecos ""
 
 RUN apt-get update && \
-    apt-get upgrade -y
+    apt-get upgrade -y && \
+    apt-get install wget -y
 
 COPY /docker-entrypoint.sh /home/spring/docker-entrypoint.sh
 RUN chmod +x /home/spring/docker-entrypoint.sh
 
-COPY /${JAR_NAME} /home/spring/${JAR_NAME}
+RUN wget -O /home/spring/databucket-app-2.2.5.jar https://github.com/databucket/databucket-app/releases/download/2.2.5/databucket-app-2.2.5.jar
 RUN chown spring:spring /home/spring/${JAR_NAME}
 
 USER spring