mirror of
https://github.com/optim-enterprises-bv/Mailu.git
synced 2025-11-01 10:37:49 +00:00
Fixed typo in Dockerfile
(cherry picked from commit 6647c96bf9)
# Conflicts:
# optional/radicale/Dockerfile
This commit is contained in:
@@ -5,8 +5,12 @@
|
|||||||
FROM base
|
FROM base
|
||||||
=======
|
=======
|
||||||
RUN apk add --no-cache curl bash python3 \
|
RUN apk add --no-cache curl bash python3 \
|
||||||
|
<<<<<<< HEAD
|
||||||
&& pip3 install radicale=2.1.12
|
&& pip3 install radicale=2.1.12
|
||||||
>>>>>>> 45f3772c (Stick radicale to 2.1.12 version)
|
>>>>>>> 45f3772c (Stick radicale to 2.1.12 version)
|
||||||
|
=======
|
||||||
|
&& pip3 install radicale==2.1.12
|
||||||
|
>>>>>>> 6647c96b (Fixed typo in Dockerfile)
|
||||||
|
|
||||||
ARG VERSION=local
|
ARG VERSION=local
|
||||||
LABEL version=$VERSION
|
LABEL version=$VERSION
|
||||||
|
|||||||
Reference in New Issue
Block a user