docker-compose.*.yml を分割

- docker-compose.*.yml を追加 - docker-compose.<DB_TYPE>.yml を指定した場合で data/config/config.phpが存在しない場合は自動インストールされるよう修正 - docker-compose.dev.yml を指定した場合はローカル環境をマウントするよう修正
EC-CUBE · Jan 5, 2021 · 75d48b5 · 75d48b5
1 parent 2eed9c7
commit 75d48b5
Show file tree

Hide file tree

Showing 8 changed files with 156 additions and 67 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -22,29 +22,14 @@ EXPOSE 443
 
 WORKDIR ${ECCUBE_PREFIX}
 
-COPY . ${ECCUBE_PREFIX}
+COPY dockerbuild/wait-for-*.sh /
+RUN chmod +x /wait-for-*.sh
 
-USER www-data
+COPY composer.json ${ECCUBE_PREFIX}/composer.json
+COPY composer.lock ${ECCUBE_PREFIX}/composer.lock
 
-RUN composer install \
-  --no-scripts \
-  --no-autoloader \
-  -d ${ECCUBE_PREFIX} \
-  ;
+RUN composer selfupdate
+RUN composer install --no-scripts --no-autoloader --no-dev -d ${ECCUBE_PREFIX}
 
+COPY . ${ECCUBE_PREFIX}
 RUN composer dumpautoload -o --apcu
-
-# trueを指定した場合、DBマイグレーションやECCubeのキャッシュ作成をスキップする。
-# ビルド時点でDBを起動出来ない場合等に指定が必要となる。
-ARG SKIP_INSTALL_SCRIPT_ON_DOCKER_BUILD=false
-ARG DBTYPE=mysql
-ARG DBSERVER=db
-ARG DBUSER=eccube_db_user
-ARG DBPASS=password
-ARG DBNAME=eccube_db
-ARG HTTP_URL=https://localhost:4430
-ARG HTTPS_URL=https://localhost:4430
-
-RUN if [ ! -f ${ECCUBE_PREFIX}/data/config/config.php ] && [ ! ${SKIP_INSTALL_SCRIPT_ON_DOCKER_BUILD} = "true" ]; then \
-        ${ECCUBE_PREFIX}/eccube_install.sh ${DBTYPE} \
-        ; fi
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -0,0 +1,6 @@
+version: '3'
+
+services:
+  ec-cube:
+    volumes:
+      - ".:/var/www/app:delegated"
diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml
@@ -0,0 +1,50 @@
+version: '3'
+
+volumes:
+  mysql-database:
+    driver: local
+
+services:
+  ec-cube:
+    command: apache2-foreground
+    entrypoint: /wait-for-mysql.sh
+    depends_on:
+      - mysql
+    environment:
+      TZ: Asia/Tokyo
+      PHP_POST_MAX_SIZE: 10M
+      PHP_UPLOAD_MAX_FILESIZE: 10M
+      PHP_LOG_ERRORS: "On"
+      PHP_ERROR_REPORTING: "E_ALL"
+      PHP_ERROR_LOG: "/proc/self/fd/2"
+      # EC-CUBE2 Config
+      HTTP_URL: https://localhost:4430/
+      HTTPS_URL: https://localhost:4430/
+      ROOT_URLPATH: /
+      DOMAIN_NAME: ~
+      DB_TYPE: mysql
+      DB_USER: eccube_db_user
+      DB_PASSWORD: password
+      DB_SERVER: mysql
+      DB_NAME: eccube_db
+      DB_PORT: ~
+      ADMIN_DIR: admin/
+      ADMIN_FORCE_SSL: 'false'
+      ADMIN_ALLOW_HOSTS: 'a:0:{}'
+      AUTH_MAGIC: ~
+      PASSWORD_HASH_ALGOS: sha256
+
+  mysql:
+    image: mysql:5.7
+    command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci
+    ports:
+      - '13306:3306'
+    volumes:
+      - mysql-database:/var/lib/mysql
+    environment:
+      MYSQL_ROOT_PASSWORD: password
+      MYSQL_DATABASE: eccube_db
+      MYSQL_USER: eccube_db_user
+      MYSQL_PASSWORD: password
+    networks:
+      - backend
diff --git a/docker-compose.pgsql.yml b/docker-compose.pgsql.yml
@@ -0,0 +1,48 @@
+version: '3'
+
+volumes:
+  pg-database:
+    driver: local
+
+services:
+  ec-cube:
+    command: apache2-foreground
+    entrypoint: /wait-for-pgsql.sh
+    depends_on:
+      - postgres
+    environment:
+      TZ: Asia/Tokyo
+      PHP_POST_MAX_SIZE: 10M
+      PHP_UPLOAD_MAX_FILESIZE: 10M
+      PHP_LOG_ERRORS: "On"
+      PHP_ERROR_REPORTING: "E_ALL"
+      PHP_ERROR_LOG: "/proc/self/fd/2"
+      # EC-CUBE2 Config
+      HTTP_URL: https://localhost:4430/
+      HTTPS_URL: https://localhost:4430/
+      ROOT_URLPATH: /
+      DOMAIN_NAME: ~
+      DB_TYPE: pgsql
+      DB_USER: eccube_db_user
+      DB_PASSWORD: password
+      DB_SERVER: postgres
+      DB_NAME: eccube_db
+      DB_PORT: 5432
+      ADMIN_DIR: admin/
+      ADMIN_FORCE_SSL: 'false'
+      ADMIN_ALLOW_HOSTS: 'a:0:{}'
+      AUTH_MAGIC: ~
+      PASSWORD_HASH_ALGOS: sha256
+
+  postgres:
+    image: postgres
+    environment:
+      - POSTGRES_DB=eccube_db
+      - POSTGRES_USER=eccube_db_user
+      - POSTGRES_PASSWORD=password
+    ports:
+      - 15432:5432
+    volumes:
+      - pg-database:/var/lib/postgresql/data
+    networks:
+      - backend
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,10 +5,6 @@ networks:
     driver: bridge
 
 volumes:
-  pg-database:
-    driver: local
-  mysql-database:
-    driver: local
   mailcatcher-data:
     driver: local
 
@@ -21,14 +17,11 @@ services:
     build:
       context: .
     volumes:
-      - ".:/var/www/app:delegated"
       ### 同期対象からコストの重いフォルダを除外 #####################
       - "vendor:/var/www/app/data/vendor"
     ports:
       - 8080:80
       - 4430:443
-    depends_on:
-      - mysql
     environment:
       TZ: Asia/Tokyo
       PHP_POST_MAX_SIZE: 10M
@@ -37,57 +30,23 @@ services:
       PHP_ERROR_REPORTING: "E_ALL"
       PHP_ERROR_LOG: "/proc/self/fd/2"
       # EC-CUBE2 Config
-      HTTP_URL: http://localhost:8080/
-      HTTPS_URL: http://localhost:8080/
+      HTTP_URL: https://localhost:4430/
+      HTTPS_URL: https://localhost:4430/
       ROOT_URLPATH: /
       DOMAIN_NAME: ~
-      DB_TYPE: mysql
-      DB_USER: eccube_db_user
-      DB_PASSWORD: password
-      DB_SERVER: mysql
-      DB_NAME: eccube_db
-      DB_PORT: ~
       ADMIN_DIR: admin/
       ADMIN_FORCE_SSL: 'false'
       ADMIN_ALLOW_HOSTS: 'a:0:{}'
       AUTH_MAGIC: ~
       PASSWORD_HASH_ALGOS: sha256
       MAIL_BACKEND: smtp
-      SMTP_HOST: ~
-      SMTP_PORT: ~
+      SMTP_HOST: 127.0.0.1
+      SMTP_PORT: 1025
       SMTP_USER: ~
       SMTP_PASSWORD: ~
     networks:
       - backend
 
-  ### MySQL ##################################
-  mysql:
-    image: mysql:5.7
-    command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci
-    ports:
-      - '13306:3306'
-    environment:
-      MYSQL_ROOT_PASSWORD: password
-      MYSQL_DATABASE: eccube_db
-      MYSQL_USER: eccube_db_user
-      MYSQL_PASSWORD: password
-    networks:
-      - backend
-
-  ### Postgres ################################
-  postgres:
-    image: postgres
-    environment:
-      - POSTGRES_DB=eccube_db
-      - POSTGRES_USER=eccube_db_user
-      - POSTGRES_PASSWORD=password
-    ports:
-      - 15432:5432
-    volumes:
-      - pg-database:/var/lib/postgresql/data
-    networks:
-      - backend
-
   ### Mailcatcher ##################################
   mailcatcher:
     image: schickling/mailcatcher

diff --git a/dockerbuild/.htaccess b/dockerbuild/.htaccess
@@ -0,0 +1,2 @@
+order allow,deny
+deny from all
diff --git a/dockerbuild/wait-for-mysql.sh b/dockerbuild/wait-for-mysql.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+echo "Waiting for mysql"
+until mysql -h "${DB_SERVER}" --password="${MYSQL_ROOT_PASSWORD}" -uroot &> /dev/null
+do
+  printf "."
+  sleep 1
+done
+
+>&2 echo "MySQL Ready"
+
+if [ ! -f /var/www/app/data/config/config.php ]
+then
+    echo "Install to ec-cube"
+    DBUSER=$DB_USER DBPASS=$DB_PASSWORD DBNAME=$DB_NAME DBPORT=$DB_PORT DBSERVER=$DB_SERVER /var/www/app/eccube_install.sh mysql
+fi
+
+exec docker-php-entrypoint "$@"
diff --git a/dockerbuild/wait-for-pgsql.sh b/dockerbuild/wait-for-pgsql.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -e
+
+export PGPASSWORD=$DB_PASSWORD
+until psql -h "${DB_SERVER}" -U "${DB_USER}" -d "template1" -c '\l'; do
+  >&2 echo "Postgres is unavailable - sleeping"
+  printf "."
+  sleep 1
+done
+
+>&2 echo "Postgres is up - executing command"
+
+if [ ! -f /var/www/app/data/config/config.php ]
+then
+    echo "Install to ec-cube"
+    DBUSER=$DB_USER DBPASS=$DB_PASSWORD DBNAME=$DB_NAME DBPORT=$DB_PORT DBSERVER=$DB_SERVER /var/www/app/eccube_install.sh pgsql
+fi
+
+exec docker-php-entrypoint "$@"