Unify oxs-tools to a single pkp-tools folder. Improve container.version output

Author: marcbria

.env

@@ -1,34 +1,30 @@
 # Set your journal Tag:
-COMPOSE_PROJECT_NAME=demo
-PROJECT_DOMAIN=demo.localhost
+COMPOSE_PROJECT_NAME="${PKP_TOOL:-pkp}"
+PROJECT_DOMAIN="${PKP_TOOL:-pkp}".localhost
 SERVERNAME=$PROJECT_DOMAIN
 
 # Web Server:
-# PHP_INI_DIR=/etc/php/8.1
+# PHP_INI_DIR="/etc/php/8.1" 
+HTTP_PORT=8081
+HTTPS_PORT=8444
 HTTPS="on"
-WEB_PATH=/var/www/html
-# HTTP_PORT=8100
-# HTTPS_PORT=8500
-
-# PKP Tool:
-PKP_TOOL=omp
-PKP_VERSION=3.3.0-21
+WEB_PATH="/var/www/html"
 
 # Database:
 # MYSQL_VERSION=10.3
-MYSQL_ROOT_PASSWORD=root
-MYSQL_USER=omp
-MYSQL_PASSWORD=changeYourPass
-MYSQL_DATABASE=omp
-
-# To autoinstall (experimental):
-# Warning: Former vars can be referenced. Be sure MYSQL_* and OJS_* are consistent.
-OJS_CLI_INSTALL=0
-OJS_DB_HOST=db
-OJS_DB_DRIVER=mysqli
-OJS_DB_USER=omp
-OJS_DB_PASSWORD=changeYourPass
-OJS_DB_NAME=omp
-OJS_WEB_CONF=/etc/apache2/conf.d/ojs.conf
-OJS_CONF=/var/www/html/config.inc.php
+MYSQL_ROOT_PASSWORD=changeRootPlease
+MYSQL_USER=pkp
+MYSQL_PASSWORD=changeMePlease
+MYSQL_DATABASE=pkp
 
+# PKP Tool:
+PKP_TOOL="${PKP_TOOL:-omp}"
+PKP_VERSION="${PKP_VERSION:-3.3.0-21}"
+PKP_CLI_INSTALL=0
+PKP_DB_HOST=db
+PKP_DB_DRIVER=mysqli
+PKP_DB_USER=pkp
+PKP_DB_PASSWORD=changeMePlease
+PKP_DB_NAME=pkp
+PKP_WEB_CONF="/etc/apache2/conf-enabled/pkp.conf"
+PKP_CONF="/var/www/html/config.inc.php"

Dockerfile

@@ -46,16 +46,18 @@ FROM ${BUILD_WEB_SERVER}
 # - Redirect log output to stdout & FILE.
 
 # Context
-ARG BUILD_PKP_TOOL                              \
-    BUILD_PKP_VERSION                           \
-    BUILD_LABEL                                 \
-    BUILD_PKP_APP_PATH
+ARG BUILD_PKP_TOOL				\
+    BUILD_PKP_VERSION				\
+    BUILD_PKP_APP_PATH				\
+    BUILD_WEB_SERVER				\
+    BUILD_LABEL
+
 
 LABEL maintainer="Public Knowledge Project <marc.bria@uab.es>"
 LABEL org.opencontainers.image.vendor="Public Knowledge Project"
 LABEL org.opencontainers.image.title="PKP ${BUILD_PKP_TOOL} Web Application"
 LABEL org.opencontainers.image.description="Runs a ${BUILD_PKP_TOOL} application over ${BUILD_WEB_SERVER}-${BUILD_OS}."
-LABEL build_version="${BUILD_PKP_TOOL} ${BUILD_PKP_VERSION} - Build-date: ${BUILD_LABEL}"
+LABEL build_version="${BUILD_PKP_TOOL}_${BUILD_PKP_VERSION}_${BUILD_LABEL}"
 
 # ARGs only work during building time, so they need to be exported to ENVs:
 ENV PKP_TOOL="${BUILD_PKP_TOOL:-ojs}"                       \
@@ -70,7 +72,7 @@ ENV PKP_TOOL="${BUILD_PKP_TOOL:-ojs}"                       \
     PKP_DB_USER="${MYSQL_USER:-pkp}"                        \
     PKP_DB_PASSWORD="${MYSQL_PASSWORD:-changeMe}"           \
     PKP_DB_NAME="${MYSQL_DATABASE:-pkp}"                    \
-    PKP_WEB_CONF="/etc/apache2/conf.d/pkp.conf" \
+    PKP_WEB_CONF="/etc/apache2/conf-enabled/pkp.conf"       \
     PKP_CONF="config.inc.php"                               \
     PKP_CMD="/usr/local/bin/pkp-start"
 
@@ -112,11 +114,14 @@ COPY --from=pkp_code "${BUILD_PKP_APP_PATH}" .
 
 # Create directories
 RUN mkdir -p /etc/ssl/apache2 "${WWW_PATH_ROOT}/files" /run/apache2
-# Make php/conf.d indpendent of the php version:
-RUN PHP_INI_DIR=$(php --ini | grep "Configuration File (php.ini) Path" | cut -d: -f2 | xargs) \
+
+# Make php's etc indpendent of the php versio:
+RUN PHP_INI_DIR=$(php --ini | grep "Configuration File (php.ini) Path" | cut -d: -f2 | xargs) 
+
 # Redirect logs to stdout
 RUN echo "log_errors = On" >> $PHP_INI_DIR/conf.d/log-errors.ini \
     && echo "error_log = /dev/stderr" >> $PHP_INI_DIR/conf.d/log-errors.ini
+
 # PKP-app config
 RUN echo "PKP_CONF: ${PKP_CONF}"
 RUN cp -a config.TEMPLATE.inc.php "${WWW_PATH_ROOT}/html/${PKP_CONF}" 
@@ -141,11 +146,16 @@ RUN apt-get clean autoclean \
 # 	&& find . -name "test" -exec rm -Rf '{}' \; \
 # 	&& find . \( -name .gitignore -o -name .gitmodules -o -name .keepme \) -exec rm -Rf '{}' \;
 
-COPY "templates/common/$BUILD_PKP_TOOL/root/" /
+COPY "templates/pkp/root/" /
+COPY "volumes/config/apache.pkp.conf" "${PKP_WEB_CONF}"
 
-RUN echo "${BUILD_PKP_TOOL}-${BUILD_PKP_VERSION} over $BUILD_WEB_SERVER on $BUILD_OS [build:" $(date "+%Y%m%d-%H%M%S") "]" > "${WWW_PATH_ROOT}/container.version" \
-    && rm -f "${BUILD_PKP_TOOL}-${BUILD_PKP_VERSION}.tar.gz" \
-    && cat "${WWW_PATH_ROOT}/container.version"
+#RUN echo "${BUILD_PKP_TOOL}-${BUILD_PKP_VERSION} over $BUILD_WEB_SERVER on $(cat /etc/issue) [build:" $(date "+%Y%m%d-%H%M%S") "]" > "${WWW_PATH_ROOT}/container.version" \
+RUN bash -c '\
+    . /etc/os-release && \
+    echo "${BUILD_PKP_TOOL}-${BUILD_PKP_VERSION} over ${BUILD_WEB_SERVER} on ${ID}-${VERSION_ID} [build: $(date +%Y%m%d-%H%M%S)]" \
+    > "${WWW_PATH_ROOT}/container.version"' && \
+    rm -f "${BUILD_PKP_TOOL}-${BUILD_PKP_VERSION}.tar.gz" && \
+    cat "${WWW_PATH_ROOT}/container.version"
 
 EXPOSE 80 
 EXPOSE 443

docker-compose.yml

@@ -22,7 +22,8 @@ services:
     restart: unless-stopped
 
   app:
-    image: local/${PKP_TOOL:-ojs}:${PKP_VERSION:-3_3_0-21}
+    # image: local/omp:3.3.0-21-php81
+    image: local/${PKP_TOOL:-ojs}:${PKP_VERSION:-3_3_0-21-php81-mbr}
     build: 
       context: .
       dockerfile: Dockerfile
@@ -41,7 +42,7 @@ services:
 #      - ./volumes/logs/app:/var/log/apache2
 #      # WARNING: You can only enable file-volumes if file exists in the container.
 #      - ./volumes/config/pkp.config.inc.php:/var/www/html/config.inc.php
-      - ./volumes/config/apache.htaccess:/var/www/html/.htaccess
+#      - ./volumes/config/apache.htaccess:/var/www/html/.htaccess
       - ./volumes/config/php.custom.ini:/usr/local/etc/php/conf.d/custom.ini
 
     networks: