From f8df97d51d56e27ae880a2b5bd71149559e91b4a Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Thu, 15 Feb 2018 23:03:01 +0100 Subject: chore: Automatically import database schema in Docker image This change will make the database image automatically import the schema and test data. --- docker-compose.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index ac4bc27f..2407e9ff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,9 @@ services: - PERSISTENCE_USER=opendc - PERSISTENCE_PASSWORD=opendcpassword mariadb: - image: mariadb:10.1 + build: + context: ./database + image: database restart: on-failure ports: - "3306:3306" # comment this line out in production -- cgit v1.2.3 From dfddb6c25c96598295ad8b50092c9f4dd946e560 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Fri, 20 Jul 2018 00:19:03 +0200 Subject: feat: Implement Scheduler Reference Architecture This change implements the parts of the Datacenter Scheduling Reference Architecture as published in SC18. This commit consists of changes to the database schema such as: - **Removal of `parallelizability` column in `Task`** This field was not used by the simulator and we opted to use a field describing the amount of cores the task can run on instead. - **Removal of `task_id` column in `MachineState`** This field did not make sense anymore now that a machine can run multiple tasks. Fortunately, this field is not used in the frontend. --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index 2407e9ff..a89b7260 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: "2" +version: "3" services: frontend: build: ./ @@ -17,7 +17,7 @@ services: simulator: build: context: ./opendc-simulator - dockerfile: opendc-integration-jpa/mysql/Dockerfile + dockerfile: opendc-model-odc/setup/Dockerfile image: simulator restart: on-failure links: -- cgit v1.2.3