diff --git a/backend/src/main/java/core/entities/timemanager/Task.java b/backend/src/main/java/core/entities/timemanager/Task.java index e2fb81e..9e6ceae 100644 --- a/backend/src/main/java/core/entities/timemanager/Task.java +++ b/backend/src/main/java/core/entities/timemanager/Task.java @@ -49,7 +49,6 @@ public class Task { this.eta = taskFieldInfo.getEta(); this.finished = false; this.finishable = taskFieldInfo.isFinishable(); - System.err.println(this.finishable); } public long getTaskID() { @@ -125,6 +124,9 @@ public class Task { } public List getBasicTaskSchedules() { + if(basicTaskSchedules == null) { + return new ArrayList<>(); + } return basicTaskSchedules; } diff --git a/docker-compose.yml b/docker-compose.yml index 84e34d0..83861fd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,9 +10,10 @@ services: ports: - "3306:3306" backend: - build: - context: ./backend - dockerfile: Dockerfile + #build: + #context: ./backend + #dockerfile: Dockerfile + image: git.fawkes100.de/sebastian/timemanager/timemanager-backend:latest links: - "db:app_db" environment: @@ -27,9 +28,10 @@ services: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro frontend: - build: - context: ./frontend - dockerfile: Dockerfile + #build: + #context: ./frontend + #dockerfile: Dockerfile + image: git.fawkes100.de/sebastian/timemanager/timemanager-frontend:latest restart: always links: - backend:backend