Merge branch 'master' of github.com:mreishus/sbin

mreishus · Jul 3, 2020 · 2a8adef · 2a8adef
2 parents 7d5e7ec + 713b15c
commit 2a8adef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/web/Dockerfile b/web/Dockerfile
@@ -34,7 +34,7 @@ RUN mix compile
 RUN mix release
 
 # prepare release image
-FROM alpine:3.11.6 AS app
+FROM alpine:3.12.0 AS app
 RUN apk add --update bash openssl
 
 RUN mkdir /app

diff --git a/web/assets/package-lock.json b/web/assets/package-lock.json