From 5e61f20e2ce659db3761701f36cfee79c01db346 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Sun, 15 Feb 2026 11:38:05 +0100 Subject: [PATCH] - Add ISL support, - Use now rx3-docker/server:1.3.0-mga9 & rx3-docker/postgresql:1.1.5-mga9 images, - Rebuild for updates. --- Dockerfile | 6 +++++- ReadMe.txt | 2 +- ReleaseNotes.txt | 12 +++++++++++- compose.yaml | 1 + env.dist | 6 +++--- 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 94e5835..fcdc287 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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} @@ -34,6 +35,8 @@ groupmod -g ${GITEA_GID} gitea chown -R gitea:gitea '${GITEA_LIB_DIR}' '${GITEA_CONFIG_DIR}' '${GIT_REPO_DIR}' '${GITEA_LOG_DIR} #--------------------------------------------------------------------------------------------------- + + #--------------------------------------------------------------------------------------------------- ARG GITEAD_INI='[program:gitead] \n\ directory='${GITEA_HOME_DIR}' \n\ @@ -44,7 +47,8 @@ environment=USER="gitea", HOME="'${GITEA_HOME_DIR}'", GITEA_WORK_DIR="'${GITEA_L -RUN urpmi.update -a \ +RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \ + && urpmi.update -a \ && urpmi --force gitea \ && echo -e "${GITEAD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/gitead \ && chmod a+x /etc/init.d/gitead \ diff --git a/ReadMe.txt b/ReadMe.txt index d50def2..a7e1d68 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,7 +5,7 @@ Welcome to Rx3-Docker/Gitea docker image! This project aims to build a Gitea docker image. Features: - - Curtently based on rx3-docker/server:1.2.7-mga9 & rx3-docker/postgresql:1.1.5-mga9 images, + - Curtently based on rx3-docker/server:1.3.0-mga9 & rx3-docker/postgresql:1.1.6-mga9 images, - Sync with Gitea 1.25.3. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 4f8ca6b..2f2d779 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,7 +1,17 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/Gitea V 1.0.1 - A. GIBERT - 2026/02/16 +------------------------------------------------------------------------------------------------------------------------------------ + +- Add ISL support, +- Use now rx3-docker/server:1.3.0-mga9 & rx3-docker/postgresql:1.1.5-mga9 images, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/Gitea V 1.0.0 - A. GIBERT - 2026/01/07 ------------------------------------------------------------------------------------------------------------------------------------ - Initial release, -- Based on rx3-docker/server:1.2.7-mga9 & rx3-docker/postgresql:1.1.5-mga9 images. +- Based on rx3-docker/server:1.2.7-mga9 & rx3-docker/postgresql:1.1.5-mga9 images, - Use gitea 1.25.3 from Rx3 RPM. diff --git a/compose.yaml b/compose.yaml index ee78abb..e162ee4 100644 --- a/compose.yaml +++ b/compose.yaml @@ -56,6 +56,7 @@ services: IMG_NAME_FULL: ${WA_IMG_NAME_FULL} IMG_VERSION: ${WA_IMG_VERSION} IMG_MAINTAINER: ${APPL_MAINTAINER} + IMG_URL: ${WA_IMG_URL} IMG_FROM_URL: ${WA_IMG_FROM_URL} restart: unless-stopped diff --git a/env.dist b/env.dist index 8972701..8744d32 100644 --- a/env.dist +++ b/env.dist @@ -20,7 +20,7 @@ APPL_NAME="gitea" APPL_NAME_FULL="Gitea Server" APPL_NAME_SHORT="gitea" APPL_ORG="rx3-docker" -APPL_VERSION="1.0.0" +APPL_VERSION="1.0.1" APPL_MAINTAINER='"Arnaud G. GIBERT" ' @@ -76,9 +76,9 @@ 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 | #------------------+----------+--------------------------+--------------------+------------------+-------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+ -docker_service_add DB database ${ORG_URL_PREFIX} postgresql - 1.1.5-mga9 - - - postgres - - 5432 - - postgres postgres +docker_service_add DB database ${ORG_URL_PREFIX} postgresql - 1.1.6-mga9 - - - postgres - - 5432 - - postgres postgres -docker_service_add WA webapp ${ORG_URL_PREFIX} gitea "Rx3-Docker/Gitea" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} server 1.2.7-mga9 - - 8078 3000 - - gitea gitea +docker_service_add WA webapp ${ORG_URL_PREFIX} gitea "Rx3-Docker/Gitea" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} server 1.3.0-mga9 - - 8078 3000 - - gitea gitea