Skip to content

Commit

Permalink
Merge pull request #1702 from codalab/feature/docker-mysql-fixes
Browse files Browse the repository at this point in the history
Docker MySQL fix
  • Loading branch information
ckcollab committed Mar 18, 2017
2 parents 8195f4c + af488fe commit 38f0c3f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
11 changes: 3 additions & 8 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,14 @@ services:
# Database
# --------------------------------------------------------------------------
mysql:
image: mysql/mysql-server:5.7
image: mysql:5.7
hostname: mysql
volumes:
- ./docker:/app/docker
- ${LOGGING_DIR}/mysql:/var/log/
- ./docker/mysql:/etc/mysql/conf.d
- ${LOGGING_DIR}/mysql:/var/log/mysql
- ${MYSQL_DATABASE_PATH}:/var/lib/mysql
env_file: .env
ports:
- 3306:3306
container_name: mysql


Expand Down Expand Up @@ -85,8 +84,6 @@ services:
memcached:
image: memcached
hostname: memcached
ports:
- ${MEMCACHED_PORT}:${MEMCACHED_PORT}
command: "/usr/local/bin/memcached -u memcache -vv"
container_name: memcached

Expand All @@ -106,8 +103,6 @@ services:
- ./docker:/app/docker
- ${LOGGING_DIR}/django:/var/log/django/
env_file: .env
ports:
- "8000:8000"
links:
- mysql
- rabbit
Expand Down
5 changes: 5 additions & 0 deletions docker/mysql/log.cnf
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[mysqld]
log-error = /var/log/mysql/error.log
slow_query_log = ON
slow_query_log_file = /var/log/mysql/slow.log
slow_launch_time = 2

0 comments on commit 38f0c3f

Please sign in to comment.