Rx3/php-apache-mga9
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

- Remove test init service,

Browse Source 
- Minor compose / dockerfile args & structure improvements.
This commit is contained in:
Arnaud G. GIBERT 2024-08-27 00:39:57 +02:00
parent 54ccdf959e
commit e332155b99
4 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.env
View File

@ -15,10 +15,10 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
# Image Settings # Image Settings
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
IMG_ID="php-apache-mga9" IMG_NAME="php-apache-mga9"
IMG_NAME="Rx3 PHP Apache Mageia-9 Docker Image" IMG_FULL_NAME="Rx3 PHP Apache Mageia-9 Docker Image"
IMG_VERSION="1.3.0" IMG_VERSION="1.3.1"
IMG_URL="${IMG_URL_PREFIX}/${IMG_ID}:${IMG_VERSION}" 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>'

11
Dockerfile
View File

@ -5,14 +5,14 @@ ARG IMG_URL_PREFIX="rx3"
FROM ${IMG_URL_PREFIX}/server-mga9:1.1.0 FROM ${IMG_URL_PREFIX}/server-mga9:1.1.0
ARG IMG_ID
ARG IMG_NAME ARG IMG_NAME
ARG IMG_FULL_NAME
ARG IMG_VERSION ARG IMG_VERSION
ARG IMG_MAINTAINER ARG IMG_MAINTAINER
LABEL org.rx3.${IMG_ID}.name=${IMG_NAME} LABEL org.rx3.${IMG_NAME}.name=${IMG_FULL_NAME}
LABEL org.rx3.${IMG_ID}.version=${IMG_VERSION} LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
LABEL org.rx3.${IMG_ID}.maintainer=${IMG_MAINTAINER} LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
LABEL maintainer=${IMG_MAINTAINER} LABEL maintainer=${IMG_MAINTAINER}
@ -57,9 +57,6 @@ RUN urpmi --force apache apache-mod_php php-cli php-pgsql php-mysqli php-pdo_
&& echo -e "${HTTPD}" | sed -e 's/ *$//' > /etc/init.d/httpd \ && echo -e "${HTTPD}" | sed -e 's/ *$//' > /etc/init.d/httpd \
&& chmod a+x /etc/init.d/httpd \ && chmod a+x /etc/init.d/httpd \
&& ln -s /etc/init.d/httpd /etc/rcD.d/S30httpd \ && ln -s /etc/init.d/httpd /etc/rcD.d/S30httpd \
&& echo -e "#!/bin/bash\n\necho 'hello world!' >/tmp/toto\necho 'Test init completed.'" > /etc/init.d/test \
&& chmod a+x /etc/init.d/test \
&& ln -s /etc/init.d/test /etc/rcD.d/S20test \
&& echo -e "${HTTPD_INI}" | sed -e 's/ *$//' > /etc/supervisord.d/httpd.ini && echo -e "${HTTPD_INI}" | sed -e 's/ *$//' > /etc/supervisord.d/httpd.ini

9
ReleaseNotes.txt
View File

@ -1,3 +1,12 @@
------------------------------------------------------------------------------------------------------------------------------------
Rx3/PHP-Apache-Mga9 V 1.3.1 - A. GIBERT - 2024/08/27
------------------------------------------------------------------------------------------------------------------------------------
- Remove test init service,
- Minor compose / dockerfile args & structure improvements.
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
Rx3/PHP-Apache-Mga9 V 1.3.0 - A. GIBERT - 2024/08/26 Rx3/PHP-Apache-Mga9 V 1.3.0 - A. GIBERT - 2024/08/26
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------

8
compose.yaml
View File

@ -1,20 +1,20 @@
# Rx3 PHP Apache Mageia-9 Docker Image # Rx3 PHP Apache Mageia-9 Docker Image
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
name: ${IMG_ID} name: ${IMG_NAME}
services: services:
webapp: webapp:
container_name: ${IMG_ID} container_name: ${IMG_NAME}
image: ${IMG_URL} image: ${IMG_URL}
build: build:
context: . context: .
args: args:
- IMG_ID=${IMG_ID}
- IMG_NAME=${IMG_NAME} - IMG_NAME=${IMG_NAME}
- IMG_FULL_NAME=${IMG_FULL_NAME}
- IMG_VERSION=${IMG_VERSION} - IMG_VERSION=${IMG_VERSION}
- IMG_MAINTAINER=${IMG_MAINTAINER} - IMG_MAINTAINER=${IMG_MAINTAINER}
- IMG_URL_PREFIX=${IMG_URL_PREFIX} - IMG_URL_PREFIX=${IMG_URL_PREFIX}
@ -29,5 +29,5 @@ services:
network_mode: bridge network_mode: bridge
ports: ports:
- "127.0.0.1:9010:9001" - "127.0.0.1:9011:9001"
- "127.0.0.1:8080:80" - "127.0.0.1:8080:80"