Skip to content

Commit

Permalink
Docker Compose バージョン2に対応
Browse files Browse the repository at this point in the history
  • Loading branch information
naga3 committed Mar 14, 2016
1 parent a1d5f79 commit ce1b803
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 19 deletions.
30 changes: 14 additions & 16 deletions docker-compose.yml
@@ -1,16 +1,14 @@
mysql:
image: mysql:5.7
environment:
MYSQL_ROOT_PASSWORD: pass
volumes:
- ./my.cnf:/etc/mysql/conf.d/my.cnf
container_name: mysql
php:
build: .
ports:
- "80:80"
volumes:
- ./www:/var/www/html
links:
- mysql:mysql
container_name: php
version: '2'
services:
mysql:
build: ./mysql
environment:
MYSQL_ROOT_PASSWORD: pass
php:
build: ./php
ports:
- '80:80'
volumes:
- ./html:/var/www/html
depends_on:
- mysql
File renamed without changes.
2 changes: 2 additions & 0 deletions mysql/Dockerfile
@@ -0,0 +1,2 @@
FROM mysql:5.7
COPY ./my.cnf /etc/mysql/conf.d/my.cnf
File renamed without changes.
2 changes: 0 additions & 2 deletions php.ini

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile → php/Dockerfile
@@ -1,4 +1,4 @@
FROM php:5.6-apache
FROM php:7-apache
COPY php.ini /usr/local/etc/php/
RUN apt-get update \
&& apt-get install -y libfreetype6-dev libjpeg62-turbo-dev libpng12-dev libmcrypt-dev \
Expand Down
5 changes: 5 additions & 0 deletions php/php.ini
@@ -0,0 +1,5 @@
[Date]
date.timezone = "Asia/Tokyo"
[mbstring]
mbstring.internal_encoding = "UTF-8"
mbstring.language = "Japanese"

0 comments on commit ce1b803

Please sign in to comment.