Compare commits

..

2 commits

Author SHA1 Message Date
50af2a9a85
oops 2024-12-14 12:14:54 +01:00
c32f858907
fix image labels 2024-12-14 12:13:04 +01:00

View file

@ -19,9 +19,10 @@ ENV CNL_DOTCLEAR=$CANAL
RUN adduser -D -g 'www' www RUN adduser -D -g 'www' www
# Image label # Image label
LABEL org.opencontainers.image.source=https://github.com/JcDenis/docker-dotclear LABEL "org.opencontainers.image.authors"="Jean-Christian Paul Denis"
LABEL org.opencontainers.image.description="Dotclear docker image $CNL_DOTCLEAR" LABEL "org.opencontainers.image.source"="https://github.com/JcDenis/docker-dotclear"
LABEL org.opencontainers.image.licenses=AGPL-3.0 LABEL "org.opencontainers.image.description"="Dotclear docker image $CNL_DOTCLEAR"
LABEL "org.opencontainers.image.licenses"="AGPL-3.0"
## ##
# Nginx # Nginx
@ -101,7 +102,7 @@ RUN curl -fsSL -o versions.xml "http://download.dotclear.org/versions.xml" \
&& unzip -d /usr/src dotclear.zip \ && unzip -d /usr/src dotclear.zip \
&& rm dotclear.zip && rm dotclear.zip
# Create www structure # Create predefined www structure
COPY www /var/lib/dotclear COPY www /var/lib/dotclear
# These variables are only used for first install, see inc/config.php, from dotclear 2.32 # These variables are only used for first install, see inc/config.php, from dotclear 2.32
@ -119,22 +120,22 @@ ENV DC_VAR=/var/www/dotclear/var
## ##
# DotclearWatch # DotclearWatch
ENV VER_DW=0.9.3 ENV VER_PLUGIN_DW=0.9.3
RUN curl -fsSL -o plugin.zip "https://github.com/JcDenis/DotclearWatch/releases/download/v$VER_DW/plugin-DotclearWatch.zip" \ RUN curl -fsSL -o plugin.zip "https://github.com/JcDenis/DotclearWatch/releases/download/v$VER_PLUGIN_DW/plugin-DotclearWatch.zip" \
&& mkdir -p /var/lib/dotclear/plugins/DotclearWatch \ && mkdir -p /var/lib/dotclear/plugins/DotclearWatch \
&& unzip -d /var/lib/dotclear/plugins plugin.zip \ && unzip -d /var/lib/dotclear/plugins plugin.zip \
&& rm plugin.zip && rm plugin.zip
# dcLog # dcLog
ENV VER_DL=1.7.3 ENV VER_PLUGIN_DL=1.7.3
RUN curl -fsSL -o plugin.zip "https://github.com/JcDenis/dcLog/releases/download/v$VER_DL/plugin-dcLog.zip" \ RUN curl -fsSL -o plugin.zip "https://github.com/JcDenis/dcLog/releases/download/v$VER_PLUGIN_DL/plugin-dcLog.zip" \
&& mkdir -p /var/lib/dotclear/plugins/dcLog \ && mkdir -p /var/lib/dotclear/plugins/dcLog \
&& unzip -d /var/lib/dotclear/plugins plugin.zip \ && unzip -d /var/lib/dotclear/plugins plugin.zip \
&& rm plugin.zip && rm plugin.zip
# sysInfo # sysInfo
ENV VER_SI=9.8 ENV VER_PLUGIN_SI=10.3
RUN curl -fsSL -o plugin.zip "https://github.com/franck-paul/sysInfo/releases/download/$VER_SI/plugin-sysInfo-$VER_SI.zip" \ RUN curl -fsSL -o plugin.zip "https://github.com/franck-paul/sysInfo/releases/download/$VER_PLUGIN_SI/plugin-sysInfo-$VER_PLUGIN_SI.zip" \
&& mkdir -p /var/lib/dotclear/plugins/sysInfo \ && mkdir -p /var/lib/dotclear/plugins/sysInfo \
&& unzip -d /var/lib/dotclear/plugins plugin.zip \ && unzip -d /var/lib/dotclear/plugins plugin.zip \
&& rm plugin.zip && rm plugin.zip