Merge pull request #20 from movabletype/feature-dockerfiles

Feature dockerfiles

Author: usualoma

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+Added support for specifying the cpanfile to be referenced at startup with DOCKER_MT_CPANFILES.
+The default value is t/cpanfile.
+
 ## [2.0.0] - 2022-02-21
 
 ### Added

Makefile

@@ -7,6 +7,7 @@ export DOCKER_COMPOSE_YAML_MIDDLEWARES:=-f ./mt/mysql.yml -f ./mt/memcached.yml
 export UP_ARGS:=-d
 export MT_HOME_PATH:=${MAKEFILE_DIR}/../movabletype
 export UPDATE_BRANCH:=yes
+export DOCKER_MT_CPANFILES:=t/cpanfile
 
 MT_CONFIG_CGI=${shell [ -e mt-config.cgi ] && echo mt-config.cgi || echo mt-config.cgi-original}
 BASE_ARCHIVE_PATH=${MAKEFILE_DIR}/archive
@@ -30,6 +31,7 @@ export DOCKER_MT_BUILD_CONTEXT
 export DOCKER_MT_DOCKERFILE
 export DOCKER_MT_IMAGE
 export DOCKER_MT_SERVICES
+export DOCKER_MT_CPANFILES
 export DOCKER_NODEJS_IMAGE
 export DOCKER_HTTPD_BUILD_CONTEXT
 export DOCKER_HTTPD_DOCKERFILE

mt/common.yml

@@ -14,6 +14,7 @@ services:
       NLS_LANG: ${NLS_LANG:-Japanese_Japan.UTF8}
       MT_DEV_UPDATE_BRANCH: ${UPDATE_BRANCH:-yes}
       DOCKER_MT_SERVICES: ${DOCKER_MT_SERVICES}
+      DOCKER_MT_CPANFILES: ${DOCKER_MT_CPANFILES}
       APACHE_LOG_DIR: ${APACHE_LOG_DIR:-/tmp/apache2/log}
       APACHE_PID_FILE: ${APACHE_PID_FILE:-/tmp/apache2/run/apache2.pid}
     volumes:

mt/docker-entrypoint.sh

@@ -1,14 +1,24 @@
 #!/bin/sh
 
+[ "$(id -u)" -eq 0 ] && SUDO= || SUDO=sudo
+
 if [ -n "$DOCKER_MT_SERVICES"  ]; then
     for s in $DOCKER_MT_SERVICES; do
-        service $s start
+        $SUDO service $s start
+    done
+fi
+
+if [ -n "$DOCKER_MT_CPANFILES"  ]; then
+    for f in $DOCKER_MT_CPANFILES; do
+        if [ -f $f ]; then
+            $SUDO cpm install -g --cpanfile=$f
+        fi
     done
 fi
 
-chmod 777 /var/www/html
-chmod 777 /var/www/cgi-bin/mt/mt-static/support
-chmod 777 /var/www/cgi-bin/mt/themes
+$SUDO chmod 777 /var/www/html
+$SUDO chmod 777 /var/www/cgi-bin/mt/mt-static/support
+$SUDO chmod 777 /var/www/cgi-bin/mt/themes
 
 if [ "$1" = "apache2-foreground" ]; then
     # invoke php-fpm