- 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_NAME_FULL
|
||||||
ARG IMG_VERSION
|
ARG IMG_VERSION
|
||||||
ARG IMG_MAINTAINER
|
ARG IMG_MAINTAINER
|
||||||
|
ARG IMG_URL
|
||||||
|
|
||||||
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
|
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
|
||||||
LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
|
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}
|
chown -R tomcat:tomcat '${TOMCAT_LOG_DIR}' '${TOMCAT_WORK_DIR}
|
||||||
#----------------------------------------------------------------------------------------------------------------
|
#----------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#----------------------------------------------------------------------------------------------------------------
|
#----------------------------------------------------------------------------------------------------------------
|
||||||
ARG TOMCATD_INI='[program:tomcatd] \n\
|
ARG TOMCATD_INI='[program:tomcatd] \n\
|
||||||
command=bash -c "source '${TOMCAT_CONFIG_FILE}' && /usr/libexec/tomcat/server start" \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 \
|
&& urpmi --force tomcat \
|
||||||
&& echo -e "${TOMCATD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/tomcatd \
|
&& echo -e "${TOMCATD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/tomcatd \
|
||||||
&& chmod a+x /etc/init.d/tomcatd \
|
&& chmod a+x /etc/init.d/tomcatd \
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ Welcome to Rx3-Docker/Tomcat docker image!
|
|||||||
This project aims to build a Tomcat docker image.
|
This project aims to build a Tomcat docker image.
|
||||||
|
|
||||||
Features:
|
Features:
|
||||||
- Curtently based on rx3-docker/java:1.1.4-mga9 image,
|
- Curtently based on rx3-docker/java:1.1.5-mga9 image,
|
||||||
- Sync with Tomcat 9.0.111 from Mageia 9 RPM.
|
- Sync with Tomcat 9.0.111 from Mageia 9 RPM.
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,13 @@
|
|||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Gitea V 1.0.1 - A. GIBERT - 2026/02/15
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Add ISL support,
|
||||||
|
- Use now rx3-docker/java-1.1.5-mga9 image,
|
||||||
|
- Rebuild for updates.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
Rx3-Docker/Gitea V 1.0.0 - A. GIBERT - 2026/01/10
|
Rx3-Docker/Gitea V 1.0.0 - A. GIBERT - 2026/01/10
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ services:
|
|||||||
IMG_NAME_FULL: ${AS_IMG_NAME_FULL}
|
IMG_NAME_FULL: ${AS_IMG_NAME_FULL}
|
||||||
IMG_VERSION: ${AS_IMG_VERSION}
|
IMG_VERSION: ${AS_IMG_VERSION}
|
||||||
IMG_MAINTAINER: ${APPL_MAINTAINER}
|
IMG_MAINTAINER: ${APPL_MAINTAINER}
|
||||||
|
IMG_URL: ${AS_IMG_URL}
|
||||||
IMG_FROM_URL: ${AS_IMG_FROM_URL}
|
IMG_FROM_URL: ${AS_IMG_FROM_URL}
|
||||||
|
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|||||||
4
env.dist
4
env.dist
@@ -20,7 +20,7 @@ APPL_NAME="tomcat"
|
|||||||
APPL_NAME_FULL="Tomcat Server"
|
APPL_NAME_FULL="Tomcat Server"
|
||||||
APPL_NAME_SHORT="tomcat"
|
APPL_NAME_SHORT="tomcat"
|
||||||
APPL_ORG="rx3-docker"
|
APPL_ORG="rx3-docker"
|
||||||
APPL_VERSION="1.0.0"
|
APPL_VERSION="1.0.1"
|
||||||
APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
||||||
|
|
||||||
|
|
||||||
@@ -76,7 +76,7 @@ DOCKER_TOOLS_EXEPTION_LIBS="postgres:pgsql"
|
|||||||
# | Prefix | Name | URL Prefix | Name | Name Full | Version | URL Prefix | Name | Version | Name | Version | Ext | Int | Ext | Int | Name / Id | Name / Id |
|
# | Prefix | Name | URL Prefix | Name | Name Full | Version | URL Prefix | Name | Version | Name | Version | Ext | Int | Ext | Int | Name / Id | Name / Id |
|
||||||
#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
|
#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
|
||||||
|
|
||||||
docker_service_add AS appl-server ${ORG_URL_PREFIX} tomcat "Rx3-Docker/Tomcat" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} java 1.1.4-mga9 - - 8077 8080 - - apache apache
|
docker_service_add AS appl-server ${ORG_URL_PREFIX} tomcat "Rx3-Docker/Tomcat" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} java 1.1.5-mga9 - - 8077 8080 - - apache apache
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user