From e4003c0700112022eda7d9c16a9da8520f8ecb95 Mon Sep 17 00:00:00 2001
From: Vladimir L <vladimir_l@gmx.net>
Date: Tue, 19 Jul 2016 21:51:22 +0200
Subject: [PATCH] use VOLUME in final service images, improved readme

---
 README.md                 |  2 +-
 docker/README.md          | 13 +++++++++++++
 docker/minimal/Dockerfile |  3 +--
 docker/minimal/build.sh   |  2 +-
 docker/ubuntu/Dockerfile  |  9 +++------
 5 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 docker/README.md

diff --git a/README.md b/README.md
index e44f05d..b1367a8 100644
--- a/README.md
+++ b/README.md
@@ -123,7 +123,7 @@ To build minimalistic image based on `alpine` image (final size is ~15 Mb) simpl
 $ ./docker/minimal/build.sh
 ```
 
-See `docker/` folder for alternative docker builds.
+See [docker folder](./docker) for alternative docker builds.
 
 ### Run container as a service
 
diff --git a/docker/README.md b/docker/README.md
new file mode 100644
index 0000000..70987e5
--- /dev/null
+++ b/docker/README.md
@@ -0,0 +1,13 @@
+# Docker Scripts
+
+## Overview
+
+```bash
+$ docker images
+
+REPOSITORY          TAG        IMAGE ID            CREATED             SIZE
+request-baskets     ubuntu     86d1c3b87154        53 seconds ago      378.8 MB
+request-baskets     alpine     7991c7cec214        6 minutes ago       15.2 MB
+request-baskets     golang     8fe4269dbc19        7 minutes ago       768.4 MB
+...
+```
diff --git a/docker/minimal/Dockerfile b/docker/minimal/Dockerfile
index 5feb383..75f2735 100644
--- a/docker/minimal/Dockerfile
+++ b/docker/minimal/Dockerfile
@@ -6,9 +6,8 @@ FROM alpine
 
 MAINTAINER Vladimir L, vladimir_l@gmx.net
 
-# Create a volume for rbaskets service
+# Create a volume for request-baskets service data folder
 VOLUME /var/lib/rbaskets
-# RUN mkdir -p /var/lib/rbaskets
 
 # Copy built service
 COPY request-baskets /usr/local/bin/
diff --git a/docker/minimal/build.sh b/docker/minimal/build.sh
index 5bac699..50ffda7 100755
--- a/docker/minimal/build.sh
+++ b/docker/minimal/build.sh
@@ -10,7 +10,7 @@ cd "$(dirname "$0")"
 docker run --rm -v "$PWD":/go/bin --env CGO_ENABLED=0 golang:latest go get -v github.com/darklynx/request-baskets
 
 # create a minimalistic docker image (based on alpine) with service only
-docker build -t request-baskets .
+docker build -t request-baskets:alpine .
 
 # cleanup
 rm request-baskets
diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
index 5b5337e..31c2259 100644
--- a/docker/ubuntu/Dockerfile
+++ b/docker/ubuntu/Dockerfile
@@ -5,8 +5,8 @@ FROM ubuntu
 
 MAINTAINER Vladimir L, vladimir_l@gmx.net
 
-# Create a volume for rbaskets service (uncomment if backups are required)
-#VOLUME /var/lib/rbaskets
+# Create a volume for request-baskets service data folder
+VOLUME /var/lib/rbaskets
 
 # One liner:
 # - Install golang & git
@@ -19,11 +19,8 @@ RUN set -x \
 	&& export GOPATH="$(mktemp -d)" \
 	&& go get github.com/darklynx/request-baskets \
 	&& cp "$GOPATH/bin/request-baskets" /usr/local/bin/ \
-	&& mkdir -p /var/lib/rbaskets \
 	&& rm -rf "$GOPATH" \
-	&& apt-get purge --auto-remove -y git golang-go \
-	&& apt-get autoclean -y \
-	&& apt-get autoremove -y
+	&& apt-get purge --auto-remove -y git golang-go
 
 # Expose ports
 EXPOSE 55555