- Add ISL support,
- Use now rx3-docker/java-1.1.5-mga9 image, - Rebuild for updates.
This commit is contained in:
@@ -9,6 +9,7 @@ ARG IMG_NAME
|
||||
ARG IMG_NAME_FULL
|
||||
ARG IMG_VERSION
|
||||
ARG IMG_MAINTAINER
|
||||
ARG IMG_URL
|
||||
|
||||
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
|
||||
LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
|
||||
@@ -36,6 +37,9 @@ chown -R root:tomcat '${TOMCAT_CONFIG_DIR}' '${TOMCAT_CACHE_DIR}' '${TOMCAT_LI
|
||||
chown -R tomcat:tomcat '${TOMCAT_LOG_DIR}' '${TOMCAT_WORK_DIR}
|
||||
#----------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
|
||||
#----------------------------------------------------------------------------------------------------------------
|
||||
ARG TOMCATD_INI='[program:tomcatd] \n\
|
||||
command=bash -c "source '${TOMCAT_CONFIG_FILE}' && /usr/libexec/tomcat/server start" \n\
|
||||
@@ -44,7 +48,8 @@ user=tomcat'
|
||||
|
||||
|
||||
|
||||
RUN urpmi.update -a \
|
||||
RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \
|
||||
&& urpmi.update -a \
|
||||
&& urpmi --force tomcat \
|
||||
&& echo -e "${TOMCATD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/tomcatd \
|
||||
&& chmod a+x /etc/init.d/tomcatd \
|
||||
|
||||
Reference in New Issue
Block a user