From b2ebb8a433662da51bfff8b4ae3b61a62a85fee7 Mon Sep 17 00:00:00 2001 From: Alexis 'Horgix' Chotard Date: Fri, 24 Jun 2016 17:38:43 +0200 Subject: [PATCH 01/12] Dockerfile: change style according to official Dockerfiles --- Dockerfile | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index 43af7455..b9ceee1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,33 +2,40 @@ # # VERSION 0.3.1 -FROM alpine:latest +FROM alpine:latest # Base packages -RUN apk update && \ - apk upgrade && \ - apk add python3 python3-dev build-base libffi-dev ca-certificates +RUN apk update \ + && apk upgrade \ + && apk add \ + python3 \ + python3-dev \ + build-base \ + libffi-dev \ + ca-certificates # Python installation # pip -ADD https://bootstrap.pypa.io/get-pip.py /tmp/install/ -RUN python3 /tmp/install/* && \ - pip install passlib bcrypt setuptools +ADD https://bootstrap.pypa.io/get-pip.py /tmp/install/ +RUN python3 /tmp/install/* && \ + pip install passlib bcrypt setuptools # Radicale installation -RUN mkdir -p /data/config -COPY . /data/radicale -COPY config /data/config -RUN cd /data/radicale && python3 setup.py install +RUN mkdir -p /data/config + +COPY . /data/radicale +COPY config /data/config + +RUN cd /data/radicale && python3 setup.py install # User -RUN adduser -h /home/radicale -D radicale && \ - mkdir -p /home/radicale/.config && \ - ln -s /data/config /home/radicale/.config/radicale && \ - chown -R radicale:radicale /data/config && \ - chown -R radicale:radicale /home/radicale +RUN adduser -h /home/radicale -D radicale \ + && mkdir -p /home/radicale/.config \ + && ln -s /data/config /home/radicale/.config/radicale \ + && chown -R radicale:radicale /data/config \ + && chown -R radicale:radicale /home/radicale -USER radicale -WORKDIR /home/radicale +USER radicale +WORKDIR /home/radicale -CMD ["radicale", "-D", "-C", "/data/config/config"] +CMD ["radicale", "-D", "-C", "/data/config/config"] From 68b2e5fb82e9aa4042931f503360c064c08862f5 Mon Sep 17 00:00:00 2001 From: Alexis 'Horgix' Chotard Date: Fri, 24 Jun 2016 17:40:43 +0200 Subject: [PATCH 02/12] Dockerfile: add maintainer --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index b9ceee1a..b4b757f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,8 @@ FROM alpine:latest +MAINTAINER Radicale project "radicale@librelist.com" + # Base packages RUN apk update \ && apk upgrade \ From b0c82f01d0463ca73f3aff8d3f4755fa6394776f Mon Sep 17 00:00:00 2001 From: Alexis 'Horgix' Chotard Date: Sun, 26 Jun 2016 15:19:07 +0200 Subject: [PATCH 03/12] Dockerfile: merge apk update and upgrade --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b4b757f5..c35d9f86 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,8 +7,7 @@ FROM alpine:latest MAINTAINER Radicale project "radicale@librelist.com" # Base packages -RUN apk update \ - && apk upgrade \ +RUN apk --update --update-cache upgrade \ && apk add \ python3 \ python3-dev \ From 8e93208fdfb9df28ea01dfcf908bedcac5f2242b Mon Sep 17 00:00:00 2001 From: Alexis 'Horgix' Chotard Date: Sun, 26 Jun 2016 15:21:48 +0200 Subject: [PATCH 04/12] Dockerfile: install pip directly from python3 module --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index c35d9f86..4177b818 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,13 +13,13 @@ RUN apk --update --update-cache upgrade \ python3-dev \ build-base \ libffi-dev \ - ca-certificates + ca-certificates \ + && python3 -m ensurepip \ + && pip3 install --upgrade pip # Python installation # pip -ADD https://bootstrap.pypa.io/get-pip.py /tmp/install/ -RUN python3 /tmp/install/* && \ - pip install passlib bcrypt setuptools +RUN pip3 install passlib bcrypt setuptools # Radicale installation RUN mkdir -p /data/config From d1fbde2e9a48484f33aa445441323ac92d6bfc83 Mon Sep 17 00:00:00 2001 From: Alexis 'Horgix' Chotard Date: Sun, 26 Jun 2016 15:29:05 +0200 Subject: [PATCH 05/12] Dockerfile: remove superfluous comments --- Dockerfile | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4177b818..f397b7a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,7 @@ -# Radicale Dockerfile -# -# VERSION 0.3.1 - FROM alpine:latest MAINTAINER Radicale project "radicale@librelist.com" -# Base packages RUN apk --update --update-cache upgrade \ && apk add \ python3 \ @@ -17,11 +12,8 @@ RUN apk --update --update-cache upgrade \ && python3 -m ensurepip \ && pip3 install --upgrade pip -# Python installation -# pip RUN pip3 install passlib bcrypt setuptools -# Radicale installation RUN mkdir -p /data/config COPY . /data/radicale From cd0e4e22476f7f7ea534cb80c26d945f30781646 Mon Sep 17 00:00:00 2001 From: Alexis 'Horgix' Chotard Date: Sun, 26 Jun 2016 17:01:44 +0200 Subject: [PATCH 06/12] Dockerfile: build from latest tarball --- Dockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f397b7a6..a922c0b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,9 @@ FROM alpine:latest MAINTAINER Radicale project "radicale@librelist.com" +ENV VERSION 1.1.1 +ENV TARBALL https://github.com/Kozea/Radicale/archive/${VERSION}.tar.gz + RUN apk --update --update-cache upgrade \ && apk add \ python3 \ @@ -12,15 +15,15 @@ RUN apk --update --update-cache upgrade \ && python3 -m ensurepip \ && pip3 install --upgrade pip -RUN pip3 install passlib bcrypt setuptools +RUN pip3 install passlib bcrypt RUN mkdir -p /data/config +RUN wget ${TARBALL} \ + && tar xzf ${VERSION}.tar.gz \ + && cd Radicale-${VERSION} && python3 setup.py install -COPY . /data/radicale COPY config /data/config -RUN cd /data/radicale && python3 setup.py install - # User RUN adduser -h /home/radicale -D radicale \ && mkdir -p /home/radicale/.config \ From 906aaab8cdcb82f22da397baeb9b6087b14e461a Mon Sep 17 00:00:00 2001 From: Alexis 'Horgix' Chotard Date: Sun, 26 Jun 2016 17:25:40 +0200 Subject: [PATCH 07/12] Dockerfile: rework config handling - No need to run as another user, containers use user namespaces - Make config file path FHS compliant --- Dockerfile | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index a922c0b6..2b188887 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,21 +17,10 @@ RUN apk --update --update-cache upgrade \ RUN pip3 install passlib bcrypt -RUN mkdir -p /data/config RUN wget ${TARBALL} \ && tar xzf ${VERSION}.tar.gz \ && cd Radicale-${VERSION} && python3 setup.py install -COPY config /data/config +COPY config /srv/radicale.conf -# User -RUN adduser -h /home/radicale -D radicale \ - && mkdir -p /home/radicale/.config \ - && ln -s /data/config /home/radicale/.config/radicale \ - && chown -R radicale:radicale /data/config \ - && chown -R radicale:radicale /home/radicale - -USER radicale -WORKDIR /home/radicale - -CMD ["radicale", "-D", "-C", "/data/config/config"] +CMD ["radicale", "-D", "-C", "/srv/radicale.conf"] From 0a8db786fa0e75ebf2c8347fdca6e53072f2b78c Mon Sep 17 00:00:00 2001 From: Alexis 'Horgix' Chotard Date: Sun, 26 Jun 2016 18:12:07 +0200 Subject: [PATCH 08/12] Dockerfile: merge distro and python dependancies --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2b188887..cf64bdae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,9 +13,8 @@ RUN apk --update --update-cache upgrade \ libffi-dev \ ca-certificates \ && python3 -m ensurepip \ - && pip3 install --upgrade pip - -RUN pip3 install passlib bcrypt + && pip3 install --upgrade pip \ + && pip3 install passlib bcrypt RUN wget ${TARBALL} \ && tar xzf ${VERSION}.tar.gz \ From 3a59f95922a0e562db877dcd6128d107f3debf0a Mon Sep 17 00:00:00 2001 From: Alexis 'Horgix' Chotard Date: Sun, 26 Jun 2016 18:12:36 +0200 Subject: [PATCH 09/12] Dockerfile: copy config from sources directly --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index cf64bdae..47f4e9ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,8 +18,8 @@ RUN apk --update --update-cache upgrade \ RUN wget ${TARBALL} \ && tar xzf ${VERSION}.tar.gz \ - && cd Radicale-${VERSION} && python3 setup.py install + && cd Radicale-${VERSION} && python3 setup.py install \ + && mkdir -p /etc/radicale \ + && cp config /etc/radicale/config -COPY config /srv/radicale.conf - -CMD ["radicale", "-D", "-C", "/srv/radicale.conf"] +CMD ["radicale", "-D", "-C", "/etc/radicale/config"] From 8faf9a423864b38e51d009917bc8ec54253d6ef2 Mon Sep 17 00:00:00 2001 From: Alexis 'Horgix' Chotard Date: Sun, 26 Jun 2016 18:25:41 +0200 Subject: [PATCH 10/12] Dockerfile: add -f argument to radicale --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 47f4e9ef..953dc092 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,4 +22,4 @@ RUN wget ${TARBALL} \ && mkdir -p /etc/radicale \ && cp config /etc/radicale/config -CMD ["radicale", "-D", "-C", "/etc/radicale/config"] +CMD ["radicale", "-f", "-D", "-C", "/etc/radicale/config"] From fbc0b1aa548216c1856773329a81333ad4cc455d Mon Sep 17 00:00:00 2001 From: Alexis 'Horgix' Chotard Date: Sun, 26 Jun 2016 19:29:18 +0200 Subject: [PATCH 11/12] Dockerfile: add EXPOSE 5232 --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 953dc092..dcbd1652 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,4 +22,6 @@ RUN wget ${TARBALL} \ && mkdir -p /etc/radicale \ && cp config /etc/radicale/config +EXPOSE 5232 + CMD ["radicale", "-f", "-D", "-C", "/etc/radicale/config"] From a6b9eaf59f952fbc1281b7d5d3bf56ef99756902 Mon Sep 17 00:00:00 2001 From: Alexis 'Horgix' Chotard Date: Sun, 26 Jun 2016 21:20:42 +0200 Subject: [PATCH 12/12] Dockerfile: remove -D option --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dcbd1652..13e9eb6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,4 +24,4 @@ RUN wget ${TARBALL} \ EXPOSE 5232 -CMD ["radicale", "-f", "-D", "-C", "/etc/radicale/config"] +CMD ["radicale", "-f", "-C", "/etc/radicale/config"]