- Now use rx3/server-mga9:1.1.1 image,
- Remove test init service, - Minor compose / dockerfile args & structure improvements.
This commit is contained in:
13
Dockerfile
13
Dockerfile
@@ -3,16 +3,16 @@
|
||||
|
||||
ARG IMG_URL_PREFIX="rx3"
|
||||
|
||||
FROM ${IMG_URL_PREFIX}/server-mga9:1.1.0
|
||||
FROM ${IMG_URL_PREFIX}/server-mga9:1.1.1
|
||||
|
||||
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}
|
||||
|
||||
|
||||
@@ -57,9 +57,6 @@ RUN urpmi --force apache apache-mod_php php-cli php-pgsql php-mysqli php-pdo_
|
||||
&& echo -e "${HTTPD}" | sed -e 's/ *$//' > /etc/init.d/httpd \
|
||||
&& chmod a+x /etc/init.d/httpd \
|
||||
&& ln -s /etc/init.d/httpd /etc/rcD.d/S30httpd \
|
||||
&& echo -e "#!/bin/bash\n\necho 'hello world!' >/tmp/toto\necho 'Test init completed.'" > /etc/init.d/test \
|
||||
&& chmod a+x /etc/init.d/test \
|
||||
&& ln -s /etc/init.d/test /etc/rcD.d/S20test \
|
||||
&& echo -e "${HTTPD_INI}" | sed -e 's/ *$//' > /etc/supervisord.d/httpd.ini
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user