Compare commits
15 Commits
tools-mga9
...
tools-1.2.
| Author | SHA1 | Date | |
|---|---|---|---|
| 30f39da74e | |||
| 33f30c4917 | |||
| 1061dac18e | |||
| a2dcf6b8dd | |||
| a49fa5e7ff | |||
| 9426e53e31 | |||
| e0e13956fd | |||
| 5d33ede3f5 | |||
| 86f481f16a | |||
| c174808c5a | |||
| ccea3a7efc | |||
| 51cdb81f47 | |||
| 607eb5eee3 | |||
| e64e8eb257 | |||
| bad45dfe9f |
130
Dockerfile
130
Dockerfile
@@ -1,44 +1,126 @@
|
|||||||
# Rx3 PHP Apache Mageia-9 Docker Image
|
# Rx3-Docker/Tools Docker Image
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
ARG IMG_URL_PREFIX="rx3"
|
ARG IMG_FROM_URL="rx3-docker/php-apache:latest"
|
||||||
|
|
||||||
FROM ${IMG_URL_PREFIX}/php-apache-mga9:1.3.3
|
FROM ${IMG_FROM_URL}
|
||||||
|
|
||||||
ARG IMG_NAME
|
ARG IMG_NAME
|
||||||
ARG IMG_FULL_NAME
|
ARG IMG_NAME_FULL
|
||||||
ARG IMG_VERSION
|
ARG IMG_VERSION
|
||||||
ARG IMG_MAINTAINER
|
ARG IMG_MAINTAINER
|
||||||
|
ARG IMG_URL
|
||||||
|
|
||||||
ARG APACHE_DOC_ROOT
|
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
|
||||||
|
|
||||||
LABEL org.rx3.${IMG_NAME}.name=${IMG_FULL_NAME}
|
|
||||||
LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
|
LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
|
||||||
LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
|
LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
|
||||||
LABEL maintainer=${IMG_MAINTAINER}
|
LABEL maintainer=${IMG_MAINTAINER}
|
||||||
|
|
||||||
ARG PHPPGADMIN_OWNER="mentax"
|
ARG APACHE_DOC_ROOT
|
||||||
ARG PHPPGADMIN_COMMIT="d0d35701af8644788f84b808d21e7fd04213baa0"
|
ARG REDPANDA_CONSOLE_PORT
|
||||||
|
|
||||||
|
|
||||||
|
ARG PHPPGADMIN_HTTPD_CONFIG="/etc/httpd/conf/sites.d/default_vhost.d/60-phppgadmin.conf"
|
||||||
|
ARG PHPPGADMIN_CONFIG="/etc/phppgadmin/config.inc.php"
|
||||||
|
|
||||||
|
ARG REDPANDA_CONSOLE_HOME="/opt/appl/redpanda_console"
|
||||||
|
ARG REDPANDA_CONSOLE_CONFIG="${REDPANDA_CONSOLE_HOME}/etc/redpanda-console-config.yaml"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
ARG TOOLSD='#!/bin/bash \n\
|
ARG TOOLSD='#!/bin/bash \n\
|
||||||
\n\
|
\n\
|
||||||
sed -i "s/$conf\[`servers`\]\[0\]\[`desc`\] = `PostgreSQL`;/$conf\[`servers`\]\[0\]\[`desc`\] = `${POSTGRESQL_SERVER_NAME}`;/" '${APACHE_DOC_ROOT}'/phppgadmin/conf/config.inc.php \n\
|
cp '${PHPPGADMIN_CONFIG}'.ref '${PHPPGADMIN_CONFIG}' \n\
|
||||||
sed -i "s/$conf\[`servers`\]\[0\]\[`host`\] = ``;/$conf\[`servers`\]\[0\]\[`host`\] = `${POSTGRESQL_HOST}`;/" '${APACHE_DOC_ROOT}'/phppgadmin/conf/config.inc.php \n\
|
chown apache:root '${PHPPGADMIN_CONFIG}' \n\
|
||||||
sed -i "s/$conf\[`servers`\]\[0\]\[`port`\] = 5432;/$conf\[`servers`\]\[0\]\[`port`\] = ${POSTGRESQL_PORT};/" '${APACHE_DOC_ROOT}'/phppgadmin/conf/config.inc.php \n\
|
\n\
|
||||||
sed -i "s/$conf\[`extra_login_security`\] = true;/$conf\[`extra_login_security`\] = false;/" '${APACHE_DOC_ROOT}'/phppgadmin/conf/config.inc.php'
|
sed -i "s/\t\$conf\[`servers`\]/\t\/\/\ $conf\[`servers`\]/" '${PHPPGADMIN_CONFIG}' \n\
|
||||||
#---------------------------------------------------------------------------------------------------
|
sed -i "s/\$conf\[`extra_login_security`\] = true;/\$conf\[`extra_login_security`\] = false;/" '${PHPPGADMIN_CONFIG}' \n\
|
||||||
|
sed -i "s/?>//" '${PHPPGADMIN_CONFIG}' \n\
|
||||||
|
\n\
|
||||||
|
for vars in POSTGRESQL_SERVER_NAME:desc POSTGRESQL_HOST:host POSTGRESQL_PORT:port \n\
|
||||||
|
do \n\
|
||||||
|
IFS=":" \n\
|
||||||
|
set ${vars} \n\
|
||||||
|
\n\
|
||||||
|
eval read -r -a $2 \<\<\< "\${$1}" \n\
|
||||||
|
done \n\
|
||||||
|
\n\
|
||||||
|
IFS=" " \n\
|
||||||
|
\n\
|
||||||
|
i=0 \n\
|
||||||
|
while [[ ${i} -lt ${#host[@]} ]] \n\
|
||||||
|
do \n\
|
||||||
|
for var in desc host port \n\
|
||||||
|
do \n\
|
||||||
|
eval echo -e "`\t\$conf`[\`servers\`][${i}][\`${var}\`]` = `\`\${${var}[${i}]}\`\;" >> '${PHPPGADMIN_CONFIG}' \n\
|
||||||
|
done \n\
|
||||||
|
\n\
|
||||||
|
echo -e "\t\$conf[`servers`][${i}][`sslmode`] = `allow`;" >> '${PHPPGADMIN_CONFIG}' \n\
|
||||||
|
echo -e "\t\$conf[`servers`][${i}][`defaultdb`] = `postgres`;" >> '${PHPPGADMIN_CONFIG}' \n\
|
||||||
|
echo -e "\t\$conf[`servers`][${i}][`pg_dump_path`] = `/usr/bin/pg_dump`;" >> '${PHPPGADMIN_CONFIG}' \n\
|
||||||
|
echo -e "\t\$conf[`servers`][${i}][`pg_dumpall_path`] = `/usr/bin/pg_dumpall`;" >> '${PHPPGADMIN_CONFIG}' \n\
|
||||||
|
\n\
|
||||||
|
i=$(( ${i} + 1)) \n\
|
||||||
|
done \n\
|
||||||
|
\n\
|
||||||
|
echo "?>" >> '${PHPPGADMIN_CONFIG}''
|
||||||
|
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
RUN urpmi --force wget \
|
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
&& mkdir -p /var/www/appl \
|
ARG REDPANDA_CONSOLED='#!/bin/bash \n\
|
||||||
&& wget -q -O- "https://github.com/${PHPPGADMIN_OWNER}/phppgadmin/archive/${PHPPGADMIN_COMMIT}.tar.gz" | tar xzf - -C ${APACHE_DOC_ROOT} \
|
\n\
|
||||||
&& mv ${APACHE_DOC_ROOT}/phppgadmin-${PHPPGADMIN_COMMIT} ${APACHE_DOC_ROOT}/phppgadmin \
|
cp '${REDPANDA_CONSOLE_CONFIG}'.ref '${REDPANDA_CONSOLE_CONFIG}' \n\
|
||||||
&& sed -i 's/$_SERVER\['\''REQUEST_URI'\''\]/preg_replace(\"\/^\\\/phppgadmin\\\/\/", "", $_SERVER['\''REQUEST_URI'\''])/g' ${APACHE_DOC_ROOT}/phppgadmin/display.php \
|
chown apache:root '${REDPANDA_CONSOLE_CONFIG}' \n\
|
||||||
&& cp ${APACHE_DOC_ROOT}/phppgadmin/conf/config.inc.php-dist ${APACHE_DOC_ROOT}/phppgadmin/conf/config.inc.php \
|
\n\
|
||||||
&& echo -e "${TOOLSD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/toolsd \
|
if [[ "${KAFKA_BROKERS}" != "" ]] \n\
|
||||||
&& chmod a+x /etc/init.d/toolsd \
|
then \n\
|
||||||
&& ln -s /etc/init.d/toolsd /etc/rcD.d/S40toolsd
|
sed -i "s/^ - broker-/ #- broker-/" '${REDPANDA_CONSOLE_CONFIG}' \n\
|
||||||
|
\n\
|
||||||
|
for broker in ${KAFKA_BROKERS} \n\
|
||||||
|
do \n\
|
||||||
|
sed -i "s/^ brokers:/ brokers:\\n - ${broker}/" '${REDPANDA_CONSOLE_CONFIG}' \n\
|
||||||
|
done \n\
|
||||||
|
\n\
|
||||||
|
sed -i "s/^ #setBasePathFromXForwardedPrefix:/ setBasePathFromXForwardedPrefix:/" '${REDPANDA_CONSOLE_CONFIG}' \n\
|
||||||
|
sed -i "s/^#server:/server:/" '${REDPANDA_CONSOLE_CONFIG}' \n\
|
||||||
|
sed -i "s/^ #listenPort: 8080/ listenPort: '${REDPANDA_CONSOLE_PORT}'/" '${REDPANDA_CONSOLE_CONFIG}' \n\
|
||||||
|
fi \n\
|
||||||
|
\n\
|
||||||
|
# RedPanda Console is disabled by default \n\
|
||||||
|
if [[ "${TOOLS_RPC_ENABLED}" != "TRUE" ]] \n\
|
||||||
|
then \n\
|
||||||
|
file_enable /etc/supervisord.d/redpanda_consoled.ini FALSE \n\
|
||||||
|
fi'
|
||||||
|
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
ARG REDPANDA_CONSOLED_INI='[program:redpanda_consoled] \n\
|
||||||
|
directory='${REDPANDA_CONSOLE_HOME}' \n\
|
||||||
|
command='${REDPANDA_CONSOLE_HOME}'/bin/redpanda-console -config.filepath '${REDPANDA_CONSOLE_CONFIG}' \n\
|
||||||
|
user=apache'
|
||||||
|
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \
|
||||||
|
&& urpmi.update -a \
|
||||||
|
&& urpmi --force wget postgresql15 phppgadmin \
|
||||||
|
&& mv /etc/httpd/conf/sites.d/phppgadmin.conf ${PHPPGADMIN_HTTPD_CONFIG} \
|
||||||
|
&& sed -i -e '/<Directory .*/,/<\/Directory>/d' ${PHPPGADMIN_HTTPD_CONFIG} \
|
||||||
|
&& echo -e "<Directory /var/www/phppgadmin>\n AllowOverride All\n Require all granted\n</Directory>" ${PHPPGADMIN_HTTPD_CONFIG} \
|
||||||
|
&& mv ${PHPPGADMIN_CONFIG} ${PHPPGADMIN_CONFIG}.ref \
|
||||||
|
&& echo -e "${TOOLSD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/toolsd \
|
||||||
|
&& chmod a+x /etc/init.d/toolsd \
|
||||||
|
&& ln -s /etc/init.d/toolsd /etc/rcD.d/S40toolsd \
|
||||||
|
&& mkdir -p ${REDPANDA_CONSOLE_HOME}/bin ${REDPANDA_CONSOLE_HOME}/etc \
|
||||||
|
&& wget -q -O- "https://github.com/redpanda-data/console/releases/download/v2.7.2/redpanda_console_2.7.2_linux_amd64.tar.gz" | tar xzf - -C ${REDPANDA_CONSOLE_HOME}/bin \
|
||||||
|
&& wget -q -O- "https://docs.redpanda.com/24.2/shared/_attachments/redpanda-console-config.yaml" > ${REDPANDA_CONSOLE_CONFIG}.ref \
|
||||||
|
&& echo -e "${REDPANDA_CONSOLED}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/redpanda_consoled \
|
||||||
|
&& chmod a+x /etc/init.d/redpanda_consoled \
|
||||||
|
&& ln -s /etc/init.d/redpanda_consoled /etc/rcD.d/S45redpanda_consoled \
|
||||||
|
&& echo -e "${REDPANDA_CONSOLED_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/redpanda_consoled.ini
|
||||||
|
|||||||
15
ReadMe.txt
15
ReadMe.txt
@@ -1,13 +1,16 @@
|
|||||||
Welcome to Rx3/Tools-Mga9 docker image!
|
Welcome to Rx3-Docker/Tools docker image!
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
This is project aims to build Mageia 9 docker image embeding some usefull tools to tests other images from Rx3 packaging projects.
|
This project aims to build a docker image embeding some usefull tools to tests other images from Rx3 packaging projects.
|
||||||
|
|
||||||
Features:
|
Features:
|
||||||
- Curtently based on rx3/php-apache-mga9:1.3.3 image,
|
- Curtently based on rx3-docker/php-apache:1.6.2-mga9 image,
|
||||||
- PHPPGAdmin (Mentax GitHub 2024/07 commit) installed,
|
- PHPPGAdmin (Mentax GitHub 2025/05/09 10926c9 commit) installed (URL: http://localhost:xxxx/phppgadmin/),
|
||||||
- PostgreSQL server name, host & port configurable.
|
- PostgreSQL server name, host & port configurable with multi-server support,
|
||||||
|
- RedPenda Console tool (V 2.7.2),
|
||||||
|
- RedPenda Console service disbled by default (TOOLS_RPC_ENABLED variable).
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Enjoy it!
|
Enjoy it!
|
||||||
@@ -16,4 +19,4 @@ Your Rx3 Team.
|
|||||||
|
|
||||||
--
|
--
|
||||||
arnaud@rx3.net
|
arnaud@rx3.net
|
||||||
https://git.rx3.org/gitea/rx3/tools-mga9
|
https://git.rx3.org/gitea/rx3-docker/tools
|
||||||
|
|||||||
@@ -1,3 +1,99 @@
|
|||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Tools V 1.2.8 - A. GIBERT - 2026/02/16
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Add ISL support,
|
||||||
|
- Use now rx3-docker/php-apache:1.6.2-mga9 image,
|
||||||
|
- Rebuild for updates.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Tools V 1.2.7 - A. GIBERT - 2025/12/02
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Use now the rx3 phpgadmin rpm,
|
||||||
|
- Fix phppgadmin config user name,
|
||||||
|
- Run RedPanda Console under apache user and not root,
|
||||||
|
- Use now rx3-docker/php-apache:1.6.0-mga9 image,
|
||||||
|
- Rebuild for updates.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Tools V 1.2.6 - A. GIBERT - 2025/09/19
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Use now rx3-docker/php-apache:1.5.4-mga9 image,
|
||||||
|
- Rebuild for updates,
|
||||||
|
- Fix RedPanda Console config file download.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Tools V 1.2.5 - A. GIBERT - 2025/04/21
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Use now rx3-docker/php-apache:1.5.3-mga9 image,
|
||||||
|
- Fix volume path bug in compose file.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Tools V 1.2.4 - A. GIBERT - 2025/03/08
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Use now rx3-docker/php-apache:1.5.2-mga9 image.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Tools V 1.2.3 - A. GIBERT - 2025/01/02
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Add RedPanda Console enabling via TOOLS_RPC_ENABLED environment variable,
|
||||||
|
- Use now rx3-docker/php-apache:1.5.1-mga9 image.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Tools V 1.2.2 - A. GIBERT - 2024/12/16
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Add PostgreSQL client package to allow PHPPGAdmin database export,
|
||||||
|
- Fix PHPPGAdmin config.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Tools V 1.2.1 - A. GIBERT - 2024/12/14
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Add multi-database server support to PHPPGAdmin.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Tools V 1.2.0 - A. GIBERT - 2024/11/24
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Add RedPanda Console tool,
|
||||||
|
- Now support docker-tools V 1.3.x.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Tools V 1.1.0 - A. GIBERT - 2024/11/11
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Move & Rename repo from Rx3/Tools-MGA9 to Rx3-Docker/Tools,
|
||||||
|
- New version naming standard,
|
||||||
|
- Now use docker_tools for .env building,
|
||||||
|
- Use now rx3-docker/php-apache:1.4.0-mga9 image,
|
||||||
|
- Add /var/log/init, /var/log/supervisor & var/log/httpd volumes.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
Rx3/Tools-Mga9 V 1.0.2 - A. GIBERT - 2024/10/29
|
Rx3/Tools-Mga9 V 1.0.2 - A. GIBERT - 2024/10/29
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
64
compose.yaml
64
compose.yaml
@@ -1,38 +1,58 @@
|
|||||||
# Rx3 Tools Mageia-9 Docker Image
|
# Rx3-Docker/Tools Docker Image
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
name: ${IMG_NAME}
|
name: ${HOST_NAME_PREFIX}
|
||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
webtools:
|
tools:
|
||||||
container_name: ${IMG_NAME}
|
container_name: ${TOOLS_HOST_NAME}
|
||||||
|
hostname: ${TOOLS_HOST_NAME}
|
||||||
|
|
||||||
image: ${IMG_URL}
|
image: ${TOOLS_IMG_URL}
|
||||||
|
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
args:
|
args:
|
||||||
- IMG_NAME=${IMG_NAME}
|
IMG_NAME: ${TOOLS_IMG_NAME}
|
||||||
- IMG_FULL_NAME=${IMG_FULL_NAME}
|
IMG_NAME_FULL: ${TOOLS_IMG_NAME_FULL}
|
||||||
- IMG_VERSION=${IMG_VERSION}
|
IMG_VERSION: ${TOOLS_IMG_VERSION}
|
||||||
- IMG_MAINTAINER=${IMG_MAINTAINER}
|
IMG_MAINTAINER: ${TOOLS_IMG_MAINTAINER}
|
||||||
- IMG_URL_PREFIX=${IMG_URL_PREFIX}
|
IMG_URL: ${TOOLS_IMG_URL}
|
||||||
- APACHE_DOC_ROOT=${APACHE_DOC_ROOT}
|
IMG_FROM_URL: ${TOOLS_IMG_FROM_URL}
|
||||||
|
|
||||||
restart: unless-stopped
|
APACHE_DOC_ROOT: ${TOOLS_DOC_ROOT}
|
||||||
|
REDPANDA_CONSOLE_PORT: ${TOOLS_PORT_ADMIN_INT}
|
||||||
|
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
APACHE_DOC_ROOT: ${APACHE_DOC_ROOT}
|
APACHE_DOC_ROOT: ${TOOLS_DOC_ROOT}
|
||||||
POSTGRESQL_SERVER_NAME: ${POSTGRESQL_SERVER_NAME}
|
|
||||||
POSTGRESQL_HOST: ${POSTGRESQL_HOST}
|
|
||||||
POSTGRESQL_PORT: ${POSTGRESQL_PORT}
|
|
||||||
MARIADB_SERVER_NAME: ${MARIADB_SERVER_NAME}
|
|
||||||
MARIADB_HOST: ${MARIADB_HOST}
|
|
||||||
MARIADB_PORT: ${MARIADB_PORT}
|
|
||||||
|
|
||||||
network_mode: bridge
|
POSTGRESQL_SERVER_NAME: ${POSTGRESQL_SERVER_NAME}
|
||||||
|
POSTGRESQL_HOST: ${POSTGRESQL_HOST}
|
||||||
|
POSTGRESQL_PORT: ${POSTGRESQL_PORT}
|
||||||
|
|
||||||
|
MARIADB_SERVER_NAME: ${MARIADB_SERVER_NAME}
|
||||||
|
MARIADB_HOST: ${MARIADB_HOST}
|
||||||
|
MARIADB_PORT: ${MARIADB_PORT}
|
||||||
|
|
||||||
|
TOOLS_RPC_ENABLED: ${TOOLS_RPC_ENABLED}
|
||||||
|
KAFKA_BROKERS: ${KAFKA_HOST}:${KAFKA_PORT}
|
||||||
|
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "curl", "-f", "http://localhost:${TOOLS_PORT_MAIN_INT}"]
|
||||||
|
interval: 10s
|
||||||
|
timeout: 3s
|
||||||
|
retries: 3
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
# - ./var/www/html:${TOOLS_DOC_ROOT}
|
||||||
|
- ./${TOOLS_LOG_INIT_EXT}:${TOOLS_LOG_INIT_INT}
|
||||||
|
- ./${TOOLS_LOG_SV_EXT}:${TOOLS_LOG_SV_INT}
|
||||||
|
- ./${TOOLS_LOG_HTTPD_EXT}:${TOOLS_LOG_HTTPD_INT}
|
||||||
|
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:${WEBAPP_SV_PORT}:9001"
|
- "127.0.0.1:${TOOLS_PORT_SV_EXT}:${TOOLS_PORT_SV_INT}"
|
||||||
- "127.0.0.1:${WEBAPP_PORT}:80"
|
- "127.0.0.1:${TOOLS_PORT_MAIN_EXT}:${TOOLS_PORT_MAIN_INT}"
|
||||||
|
- "127.0.0.1:${TOOLS_PORT_ADMIN_EXT}:${TOOLS_PORT_ADMIN_INT}"
|
||||||
|
|||||||
47
env
47
env
@@ -1,47 +0,0 @@
|
|||||||
# Rx3 Tools Mageia-9 Docker Image
|
|
||||||
#-------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------
|
|
||||||
# Global Settings
|
|
||||||
#-------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
IMG_ORG="rx3"
|
|
||||||
IMG_REGISTRY="docker.xor.rx3:5000"
|
|
||||||
IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------
|
|
||||||
# Image Settings
|
|
||||||
#-------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
|
|
||||||
IMG_NAME="tools-mga9"
|
|
||||||
IMG_FULL_NAME="Rx3 Tools Mageia-9 Docker Image"
|
|
||||||
IMG_VERSION="1.0.2"
|
|
||||||
IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
|
|
||||||
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------
|
|
||||||
# User Settings
|
|
||||||
#-------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
ENV_PORT_OFFSET=0
|
|
||||||
SV_PORT_OFFSET=1000
|
|
||||||
|
|
||||||
WEBAPP_PORT=$(( 8070 + ${ENV_PORT_OFFSET}))
|
|
||||||
WEBAPP_SV_PORT=$(( ${WEBAPP_PORT} + ${SV_PORT_OFFSET}))
|
|
||||||
|
|
||||||
APACHE_UID=980
|
|
||||||
APACHE_GID=977
|
|
||||||
APACHE_DOC_ROOT=/var/www/html
|
|
||||||
|
|
||||||
POSTGRESQL_SERVER_NAME=""
|
|
||||||
POSTGRESQL_HOST=""
|
|
||||||
POSTGRESQL_PORT=""
|
|
||||||
|
|
||||||
MARIADB_SERVER_NAME=""
|
|
||||||
MARIADB_HOST=""
|
|
||||||
MARIADB_PORT=""
|
|
||||||
57
env.dist
Normal file
57
env.dist
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
# Rx3-Docker/Tools Docker Image
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Global Settings
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
ORG_NAME="rx3-docker"
|
||||||
|
ORG_REGISTRY="docker.xor.rx3:5000"
|
||||||
|
|
||||||
|
ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Image Settings
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
HOST_NAME_PREFIX=""
|
||||||
|
|
||||||
|
PORT_ENV_OFFSET=0
|
||||||
|
|
||||||
|
PORT_SV_INT=9001
|
||||||
|
PORT_SV_OFFSET=1000
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+-----------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
|
||||||
|
# | Variable | Service | Target Image | From Image | Module | Main Port | Admin Port | User | Group |
|
||||||
|
# | 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 TOOLS tools ${ORG_URL_PREFIX} - "Rx3-Docker/Tools" 1.2.8-mga9 ${ORG_URL_PREFIX} php-apache 1.6.2-mga9 - - 8070 80 8092 8080 apache apache
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# User Settings
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
TOOLS_LOG_HTTPD_INT="/var/log/httpd"
|
||||||
|
TOOLS_LOG_HTTPD_EXT="./var/log/httpd"
|
||||||
|
|
||||||
|
TOOLS_DOC_ROOT="/var/www/html"
|
||||||
|
|
||||||
|
POSTGRESQL_SERVER_NAME="Default"
|
||||||
|
POSTGRESQL_HOST="127.0.0.1"
|
||||||
|
POSTGRESQL_PORT="5342"
|
||||||
|
|
||||||
|
MARIADB_SERVER_NAME="Default"
|
||||||
|
MARIADB_HOST="127.0.0.1"
|
||||||
|
MARIADB_PORT="3306"
|
||||||
|
|
||||||
|
TOOLS_RPC_ENABLED="FALSE"
|
||||||
|
|
||||||
|
KAFKA_HOST="127.0.0.1"
|
||||||
|
KAFKA_PORT="9092"
|
||||||
4
var/log/httpd/.gitignore
vendored
Normal file
4
var/log/httpd/.gitignore
vendored
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
# Ignore everything in this directory
|
||||||
|
*
|
||||||
|
# Except this file
|
||||||
|
!.gitignore
|
||||||
4
var/log/init/.gitignore
vendored
Normal file
4
var/log/init/.gitignore
vendored
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
# Ignore everything in this directory
|
||||||
|
*
|
||||||
|
# Except this file
|
||||||
|
!.gitignore
|
||||||
4
var/log/supervisor/.gitignore
vendored
Normal file
4
var/log/supervisor/.gitignore
vendored
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
# Ignore everything in this directory
|
||||||
|
*
|
||||||
|
# Except this file
|
||||||
|
!.gitignore
|
||||||
Reference in New Issue
Block a user