From 3b3521aee40d1b420238c258897dcace56d00351 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 10 Jan 2017 16:16:11 +0100 Subject: [PATCH] update base image --- .editorconfig | 9 +++++++++ Dockerfile | 5 ++--- 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..d741e40 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true +indent_style = space +indent_size = 4 diff --git a/Dockerfile b/Dockerfile index b1c8270..03970a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,7 @@ FROM quay.io/thallian/confd-env:latest RUN addgroup syncer RUN adduser -h /app -D -G syncer syncer -RUN apk --no-cache add tar redis make git openssl perl gcc musl-dev pcre pcre-dev openssl-dev lua lua-dev unzip curl -RUN apk --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/community/ --allow-untrusted add luarocks5.1 +RUN apk --no-cache add tar redis make git libressl perl gcc musl-dev pcre pcre-dev libressl-dev lua lua-dev unzip curl luarocks WORKDIR /app @@ -34,7 +33,7 @@ RUN chown -R syncer:syncer /app RUN ln -s /usr/lib/lua /usr/local/lib/lua RUN ln -s /usr/share/lua/ /usr/local/share/lua -RUN apk del tar make git gcc musl-dev pcre-dev openssl-dev lua-dev +RUN apk del tar make git gcc musl-dev pcre-dev libressl-dev lua-dev EXPOSE 7200 VOLUME /var/lib/redis/