- Minor compose / dockerfile args & structure improvements,
- Use now rx3/base-mga9:1.2.3 image.
This commit is contained in:
12
Dockerfile
12
Dockerfile
@@ -3,16 +3,16 @@
|
||||
|
||||
ARG IMG_URL_PREFIX="rx3"
|
||||
|
||||
FROM ${IMG_URL_PREFIX}/base-mga9:1.2.2
|
||||
FROM ${IMG_URL_PREFIX}/base-mga9:1.2.3
|
||||
|
||||
ARG IMG_ID
|
||||
ARG IMG_NAME
|
||||
ARG IMG_FULL_NAME
|
||||
ARG IMG_VERSION
|
||||
ARG IMG_MAINTAINER
|
||||
|
||||
LABEL org.rx3.${IMG_ID}.name=${IMG_NAME}
|
||||
LABEL org.rx3.${IMG_ID}.version=${IMG_VERSION}
|
||||
LABEL org.rx3.${IMG_ID}.maintainer=${IMG_MAINTAINER}
|
||||
LABEL org.rx3.${IMG_NAME}.name=${IMG_FULL_NAME}
|
||||
LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
|
||||
LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
|
||||
LABEL maintainer=${IMG_MAINTAINER}
|
||||
|
||||
|
||||
@@ -70,7 +70,7 @@ RUN urpmi --force supervisor
|
||||
&& mkdir /etc/rc.d/rcD.d \
|
||||
&& ln -s /etc/rc.d/rcD.d /etc \
|
||||
&& echo -e "${SUPERVISORD_INI}" | sed -e 's/ *$//' > /etc/supervisord.d/supervisord.ini \
|
||||
&& echo -e "${CROND_INI}" | sed -e 's/ *$//' > /etc/supervisord.d/crond.ini \
|
||||
&& echo -e "${CROND_INI}" | sed -e 's/ *$//' > /etc/supervisord.d/crond.ini \
|
||||
&& echo -e "${SUPERVISORD}" | sed -e 's/ *$//' > /etc/init.d/supervisord \
|
||||
&& chmod a+x /etc/init.d/supervisord \
|
||||
&& ln -s /etc/init.d/supervisord /etc/rcD.d/S99supervisord
|
||||
|
||||
Reference in New Issue
Block a user