-
Notifications
You must be signed in to change notification settings - Fork 98
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
docker-compose 対応 #425
Merged
Merged
docker-compose 対応 #425
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- docker-compose.*.yml を追加 - docker-compose.<DB_TYPE>.yml を指定した場合で data/config/config.phpが存在しない場合は自動インストールされるよう修正 - docker-compose.dev.yml を指定した場合はローカル環境をマウントするよう修正
start_year > end_year になっていたのを修正
OWASP ZAP と連携できることも確認 |
nobuhiko
approved these changes
Jan 12, 2021
@okazy お時間ある時に、テスト落ちる原因になってるやつだけでもmergeお願いします〜 |
Windowsのテストは他のプルリクで解決済みです。 |
travis通りましたのでマージします。対応ありがとうございました。 |
11 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
close #424
refs EC-CUBE/ec-cube#4694
使用方法
DB を別途用意する場合
php:7.4-apache のみ起動します
PostgreSQL を使用する場合
docker-compose.pgsql.yml を指定します。 data/config/config.php が存在しない場合は、 EC-CUBE のインストールまで実行します。
MySQL を使用する場合
docker-compose.mysql.yml を指定します。 data/config/config.php が存在しない場合は、 EC-CUBE のインストールまで実行します。
ローカル環境をマウントする場合
docker-compose.dev.yml を指定します。
## MySQL を使用する例 docker-compose -f docker-compose.yml -f docker-compose.mysql.yml -f docker-compose.dev.yml up
OWASP ZAP を使用する場合
https://ec-cube/
に変更するTODO