Fix image in docker-compose and fix nullpointer exception when getting TaskSchedules
This commit is contained in:
parent
06a5826240
commit
bbae17fd25
@ -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<AbstractSchedule> getBasicTaskSchedules() {
|
||||
if(basicTaskSchedules == null) {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
return basicTaskSchedules;
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user