[UPD]Radicale bump version, add c7

This commit is contained in:
Fabien BOURGEOIS 2020-05-17 07:21:43 +02:00
parent ad3dacb5e8
commit 909cf69c77
3 changed files with 8 additions and 5 deletions

View File

@ -5,8 +5,6 @@ MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK. # > 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 LANG C.UTF-8
ENV VERSION 2.1.9
# Install dependencies # Install dependencies
RUN apt-get update && apt-get install -y --no-install-recommends python3 python3-pip RUN apt-get update && apt-get install -y --no-install-recommends python3 python3-pip
@ -19,6 +17,7 @@ WORKDIR /opt/radicale
USER radicale USER radicale
# Install Radicale # Install Radicale
ENV VERSION 2.1.11
RUN pip3 install --user --upgrade radicale==${VERSION} RUN pip3 install --user --upgrade radicale==${VERSION}
COPY config /opt/radicale/radicale.conf COPY config /opt/radicale/radicale.conf
RUN mkdir /opt/radicale/storage RUN mkdir /opt/radicale/storage

View File

@ -5,8 +5,6 @@ MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK. # > 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 LANG C.UTF-8
ENV VERSION 2.1.9
# Install dependencies # Install dependencies
RUN yum install -y centos-release-scl RUN yum install -y centos-release-scl
RUN yum-config-manager --enable rhel-server-rhscl-7-rpms RUN yum-config-manager --enable rhel-server-rhscl-7-rpms
@ -17,6 +15,7 @@ WORKDIR /opt/radicale
USER radicale USER radicale
# Install Radicale # Install Radicale
ENV VERSION 2.1.11
RUN scl enable rh-python35 "pip install --user radicale==${VERSION}" RUN scl enable rh-python35 "pip install --user radicale==${VERSION}"
COPY config .config/radicale/config/ COPY config .config/radicale/config/
RUN mkdir /opt/radicale/storage RUN mkdir /opt/radicale/storage

View File

@ -1,5 +1,10 @@
version: '2.2' version: '2.4'
services: services:
radicale: radicale:
build: . build: .
image: registry.yaltik.net/radicale:yaltik image: registry.yaltik.net/radicale:yaltik
radicalec7:
build:
context: .
dockerfile: Dockerfile.c7
image: registry.yaltik.net/radicale:yaltikc7