From 23f9d649a8a2fd3067a662f758c8edd13b480853 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 10 Jan 2017 11:28:34 +0100 Subject: [PATCH] update base image --- .editorconfig | 9 +++++++++ Dockerfile | 4 ++-- 2 files changed, 11 insertions(+), 2 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 751f1e1..afac8af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -FROM thallian/confd-env:latest +FROM quay.io/thallian/confd-env:latest -RUN apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/community/ --allow-untrusted php7-fpm +RUN apk --no-cache add php7-fpm ADD /rootfs /