From 1b0d48fa209ec088de030c48c37b84c7e1d1b821 Mon Sep 17 00:00:00 2001
From: Jose Quintana <joseluisquintana20@gmail.com>
Date: Wed, 4 Mar 2020 09:36:25 +0100
Subject: [PATCH] v1.6.0

---
 Cargo.lock                | 2 +-
 Cargo.toml                | 2 +-
 docker/alpine/Dockerfile  | 6 ++++--
 docker/scratch/Dockerfile | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f5dd5a2..5a64e86 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -876,7 +876,7 @@ checksum = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc"
 
 [[package]]
 name = "static-web-server"
-version = "1.5.0"
+version = "1.6.0"
 dependencies = [
  "chrono",
  "env_logger",
diff --git a/Cargo.toml b/Cargo.toml
index 50ad453..21d486e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "static-web-server"
-version = "1.5.0"
+version = "1.6.0"
 authors = ["Jose Quintana <https://git.io/joseluisq>"]
 license = "MIT OR Apache-2.0"
 description = "A blazing fast static files-serving web server powered by Rust Iron."
diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile
index bebf330..3e7382c 100644
--- a/docker/alpine/Dockerfile
+++ b/docker/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.10
+FROM alpine:3.11
 
 LABEL maintainer="Jose Quintana <joseluisq.net>"
 
@@ -12,9 +12,11 @@ RUN set -ex; \
     *) echo >&2 "error: unsupported architecture: $apkArch"; exit 1 ;; \
     esac;
 
+COPY ./docker/alpine/entrypoint.sh /
 COPY ./bin/static-web-server /usr/local/bin/
 COPY ./public /public
 EXPOSE 80
+ENTRYPOINT ["/entrypoint.sh"]
 CMD ["static-web-server"]
 
 # Metadata
@@ -22,5 +24,5 @@ LABEL org.opencontainers.image.vendor="Jose Quintana" \
     org.opencontainers.image.url="https://github.com/joseluisq/static-web-server" \
     org.opencontainers.image.title="Static Web Server" \
     org.opencontainers.image.description="A blazing fast static files-serving web server powered by Rust Iron." \
-    org.opencontainers.image.version="v1.5.0" \
+    org.opencontainers.image.version="v1.6.0" \
     org.opencontainers.image.documentation="https://github.com/joseluisq/static-web-server"
diff --git a/docker/scratch/Dockerfile b/docker/scratch/Dockerfile
index 01fb7cf..6f4192f 100644
--- a/docker/scratch/Dockerfile
+++ b/docker/scratch/Dockerfile
@@ -14,5 +14,5 @@ LABEL org.opencontainers.image.vendor="Jose Quintana" \
     org.opencontainers.image.url="https://github.com/joseluisq/static-web-server" \
     org.opencontainers.image.title="Static Web Server" \
     org.opencontainers.image.description="A blazing fast static files-serving web server powered by Rust Iron." \
-    org.opencontainers.image.version="v1.5.0" \
+    org.opencontainers.image.version="v1.6.0" \
     org.opencontainers.image.documentation="https://github.com/joseluisq/static-web-server"
--
libgit2 1.7.2