Rx3-Docker/tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

- Move & Rename repo from Rx3/Tools-MGA9 to Rx3-Docker/Tools,

Browse Source 
- New version naming standard,
- Now use docker_tools for .env building,
- Use now rx3-docker/server:1.2.0-mga9 image.
This commit is contained in:
Arnaud G. GIBERT 2024-11-11 19:25:48 +01:00
parent b7d83b4a63
commit bad45dfe9f
5 changed files with 73 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfile
View File

@ -1,18 +1,18 @@
# 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 APACHE_DOC_ROOT ARG APACHE_DOC_ROOT
LABEL org.rx3.${IMG_NAME}.name=${IMG_FULL_NAME} 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}
LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER} LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
LABEL maintainer=${IMG_MAINTAINER} LABEL maintainer=${IMG_MAINTAINER}

10
ReadMe.txt
View File

@ -1,12 +1,12 @@
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.4.0-mga9 image,
- PHPPGAdmin (Mentax GitHub 2024/07 commit) installed, - PHPPGAdmin (Mentax GitHub 2024/07 commit) installed (URL: http://localhost:xxxx/phppgadmin/),
- PostgreSQL server name, host & port configurable. - PostgreSQL server name, host & port configurable.
@ -16,4 +16,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

11
ReleaseNotes.txt
View File

@ -1,3 +1,14 @@
------------------------------------------------------------------------------------------------------------------------------------
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/server:1.2.0-mga9 image.
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
Rx3/Tools-Mga9 V 1.0.2 - A. GIBERT - 2024/10/29 Rx3/Tools-Mga9 V 1.0.2 - A. GIBERT - 2024/10/29
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------

21
compose.yaml
View File

@ -1,4 +1,4 @@
# Rx3 Tools Mageia-9 Docker Image # Rx3-Docker/Tools Docker Image
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
name: ${IMG_NAME} name: ${IMG_NAME}
@ -7,18 +7,19 @@ services:
webtools: webtools:
container_name: ${IMG_NAME} container_name: ${IMG_NAME}
hostname: ${IMG_NAME}
image: ${IMG_URL} image: ${IMG_URL}
build: build:
context: . context: .
args: args:
- IMG_NAME=${IMG_NAME} IMG_NAME: ${IMG_NAME}
- IMG_FULL_NAME=${IMG_FULL_NAME} IMG_FULL_NAME: ${IMG_NAME_FULL}
- IMG_VERSION=${IMG_VERSION} IMG_VERSION: ${IMG_VERSION}
- IMG_MAINTAINER=${IMG_MAINTAINER} IMG_MAINTAINER: ${IMG_MAINTAINER}
- IMG_URL_PREFIX=${IMG_URL_PREFIX} IMG_FROM_URL: ${IMG_FROM_URL}
- APACHE_DOC_ROOT=${APACHE_DOC_ROOT} APACHE_DOC_ROOT: ${APACHE_DOC_ROOT}
restart: unless-stopped restart: unless-stopped
@ -31,8 +32,6 @@ services:
MARIADB_HOST: ${MARIADB_HOST} MARIADB_HOST: ${MARIADB_HOST}
MARIADB_PORT: ${MARIADB_PORT} MARIADB_PORT: ${MARIADB_PORT}
network_mode: bridge
ports: ports:
- "127.0.0.1:${WEBAPP_SV_PORT}:9001" - "127.0.0.1:${WEBTOOLS_PORT_SV_EXT}:${WEBTOOLS_PORT_SV_INT}"
- "127.0.0.1:${WEBAPP_PORT}:80" - "127.0.0.1:${WEBTOOLS_PORT_MAIN_EXT}:${WEBTOOLS_PORT_MAIN_INT}"

40
env → env.dist
View File

@ -1,13 +1,14 @@
# Rx3 Tools Mageia-9 Docker Image # Rx3-Docker/Tools Docker Image
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Global Settings # Global Settings
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
IMG_ORG="rx3" ORG_NAME="rx3-docker"
IMG_REGISTRY="docker.xor.rx3:5000" ORG_REGISTRY="docker.xor.rx3:5000"
IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
@ -16,12 +17,16 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
IMG_NAME="tools-mga9" IMG_NAME="tools"
IMG_FULL_NAME="Rx3 Tools Mageia-9 Docker Image" IMG_NAME_FULL="Rx3-Docker/Tools Docker Image"
IMG_VERSION="1.0.2" IMG_VERSION="1.1.0-mga9"
IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>' IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
IMG_URL_PREFIX="${ORG_URL_PREFIX}"
IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
IMG_FROM_URL="${ORG_URL_PREFIX}/php-apache:1.4.0-mga9"
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -31,17 +36,20 @@ IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
ENV_PORT_OFFSET=0 ENV_PORT_OFFSET=0
SV_PORT_OFFSET=1000 SV_PORT_OFFSET=1000
WEBAPP_PORT=$(( 8070 + ${ENV_PORT_OFFSET})) WEBTOOLS_PORT_MAIN_EXT=$(( 8070 + ${ENV_PORT_OFFSET}))
WEBAPP_SV_PORT=$(( ${WEBAPP_PORT} + ${SV_PORT_OFFSET})) WEBTOOLS_PORT_MAIN_INT=80
WEBTOOLS_PORT_SV_EXT=$(( ${WEBTOOLS_PORT_MAIN_EXT} + ${SV_PORT_OFFSET}))
WEBTOOLS_PORT_SV_INT=9001
APACHE_UID=980 APACHE_UID=980
APACHE_GID=977 APACHE_GID=977
APACHE_DOC_ROOT=/var/www/html APACHE_DOC_ROOT=/var/www/html
POSTGRESQL_SERVER_NAME="" POSTGRESQL_SERVER_NAME="Default"
POSTGRESQL_HOST="" POSTGRESQL_HOST="127.0.0.1"
POSTGRESQL_PORT="" POSTGRESQL_PORT="5342"
MARIADB_SERVER_NAME="" MARIADB_SERVER_NAME="Default"
MARIADB_HOST="" MARIADB_HOST="127.0.0.1"
MARIADB_PORT="" MARIADB_PORT="3306"