From 909cf69c77c23a86c68c12cd853d32e0d1583224 Mon Sep 17 00:00:00 2001 From: Fabien BOURGEOIS Date: Sun, 17 May 2020 07:21:43 +0200 Subject: [PATCH] [UPD]Radicale bump version, add c7 --- radicale/Dockerfile | 3 +-- radicale/Dockerfile.c7 | 3 +-- radicale/base.yml | 7 ++++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/radicale/Dockerfile b/radicale/Dockerfile index 10bf2ad..edbf147 100644 --- a/radicale/Dockerfile +++ b/radicale/Dockerfile @@ -5,8 +5,6 @@ MAINTAINER Yaltik - Fabien Bourgeois # > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK. ENV LANG C.UTF-8 -ENV VERSION 2.1.9 - # Install dependencies RUN apt-get update && apt-get install -y --no-install-recommends python3 python3-pip @@ -19,6 +17,7 @@ WORKDIR /opt/radicale USER radicale # Install Radicale +ENV VERSION 2.1.11 RUN pip3 install --user --upgrade radicale==${VERSION} COPY config /opt/radicale/radicale.conf RUN mkdir /opt/radicale/storage diff --git a/radicale/Dockerfile.c7 b/radicale/Dockerfile.c7 index 3518056..98ac51c 100644 --- a/radicale/Dockerfile.c7 +++ b/radicale/Dockerfile.c7 @@ -5,8 +5,6 @@ MAINTAINER Yaltik - Fabien Bourgeois # > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK. ENV LANG C.UTF-8 -ENV VERSION 2.1.9 - # Install dependencies RUN yum install -y centos-release-scl RUN yum-config-manager --enable rhel-server-rhscl-7-rpms @@ -17,6 +15,7 @@ WORKDIR /opt/radicale USER radicale # Install Radicale +ENV VERSION 2.1.11 RUN scl enable rh-python35 "pip install --user radicale==${VERSION}" COPY config .config/radicale/config/ RUN mkdir /opt/radicale/storage diff --git a/radicale/base.yml b/radicale/base.yml index df6be80..a291b69 100644 --- a/radicale/base.yml +++ b/radicale/base.yml @@ -1,5 +1,10 @@ -version: '2.2' +version: '2.4' services: radicale: build: . image: registry.yaltik.net/radicale:yaltik + radicalec7: + build: + context: . + dockerfile: Dockerfile.c7 + image: registry.yaltik.net/radicale:yaltikc7