From ac01f41ab7c9c1779a82e44d593338ea92b7cf3e Mon Sep 17 00:00:00 2001 From: alext Date: Mon, 16 Jan 2017 23:33:27 +0100 Subject: [PATCH] Edited docker configuration. --- Dockerfile | 4 +--- docker-compose.yml | 26 ++++++++++---------------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index bd68ba9d..2545f434 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,5 @@ FROM tutum/apache-php -MAINTAINER Kun Ran +MAINTAINER Alex Tselegidis -# Note: this only exposes the port to other docker containers. You -# still have to bind to 80@host at runtime, as per the ACME spec. EXPOSE 80 diff --git a/docker-compose.yml b/docker-compose.yml index 5c7764b3..7a63f0f1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,29 +1,23 @@ -# Easy!Appointments -# docker-compose up ea -ea_data: +storage: image: 'busybox:latest' volumes: - /var/lib/mysql - ./src:/app command: sleep 3153600000 -ea_db: - environment: - MYSQL_ROOT_PASSWORD: supersecret - MYSQL_DATABASE: easyappts +database: image: mysql:5.7 + environment: + MYSQL_ROOT_PASSWORD: root + MYSQL_DATABASE: easyappointments volumes_from: - - ea_data - # ports: - # - 8003:3306 + - storage restart: always mem_limit: 200m -ea: +app: build: ./ ports: - - 8001:80 - # - 8002:9000 + - 80:80 links: - - ea_db:ea_db + - database:database volumes_from: - - ea_data -# Easy!Appointments end + - storage