static-web-server.git

author	Jose Quintana <joseluisquintana20@gmail.com>	2019-12-25 23:21:01.0 +00:00:00
committer	Jose Quintana <joseluisquintana20@gmail.com>	2019-12-25 23:21:01.0 +00:00:00
commit	b687a0224f54da289d18591b3482c0175c49e1bb [patch]
tree	22318cb985fe55281253f85710e69aaf0ee9c82c
parent	de639c462f7eeae3f2d262cac5a624b9a2c97bd5
parent	112a1f3b6f7a19a12b12cbbea6835da98ec2dd50
download	b687a0224f54da289d18591b3482c0175c49e1bb.tar.gz

Merge branch 'develop'

Diff

 docker/alpine/Dockerfile.tmpl  | 6 +++---
 docker/scratch/Dockerfile.tmpl | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker/alpine/Dockerfile.tmpl b/docker/alpine/Dockerfile.tmpl
index 9d5a132..64b509f 100644
--- a/docker/alpine/Dockerfile.tmpl
+++ b/docker/alpine/Dockerfile.tmpl
@@ -19,8 +19,8 @@ CMD ["static-web-server"]

# Metadata
LABEL org.opencontainers.image.vendor="Jose Quintana" \
    org.opencontainers.image.url="https://git.joseluisq.net/joseluisq/static-web-server" \
    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 web server to static files-serving powered by Rust." \
    org.opencontainers.image.description="A blazing fast static files-serving web server powered by Rust Iron." \
    org.opencontainers.image.version="$VERSION" \
    org.opencontainers.image.documentation="https://git.joseluisq.net/joseluisq/static-web-server"
    org.opencontainers.image.documentation="https://github.com/joseluisq/static-web-server"
diff --git a/docker/scratch/Dockerfile.tmpl b/docker/scratch/Dockerfile.tmpl
index 9a9c646..e43b324 100644
--- a/docker/scratch/Dockerfile.tmpl
+++ b/docker/scratch/Dockerfile.tmpl
@@ -11,8 +11,8 @@ ENTRYPOINT ["/static-web-server"]

# Metadata
LABEL org.opencontainers.image.vendor="Jose Quintana" \
    org.opencontainers.image.url="https://git.joseluisq.net/joseluisq/static-web-server" \
    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 web server to static files-serving powered by Rust." \
    org.opencontainers.image.description="A blazing fast static files-serving web server powered by Rust Iron." \
    org.opencontainers.image.version="$VERSION" \
    org.opencontainers.image.documentation="https://git.joseluisq.net/joseluisq/static-web-server"
    org.opencontainers.image.documentation="https://github.com/joseluisq/static-web-server"