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.eta = taskFieldInfo.getEta();
|
||||||
this.finished = false;
|
this.finished = false;
|
||||||
this.finishable = taskFieldInfo.isFinishable();
|
this.finishable = taskFieldInfo.isFinishable();
|
||||||
System.err.println(this.finishable);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public long getTaskID() {
|
public long getTaskID() {
|
||||||
@ -125,6 +124,9 @@ public class Task {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public List<AbstractSchedule> getBasicTaskSchedules() {
|
public List<AbstractSchedule> getBasicTaskSchedules() {
|
||||||
|
if(basicTaskSchedules == null) {
|
||||||
|
return new ArrayList<>();
|
||||||
|
}
|
||||||
return basicTaskSchedules;
|
return basicTaskSchedules;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -10,9 +10,10 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- "3306:3306"
|
- "3306:3306"
|
||||||
backend:
|
backend:
|
||||||
build:
|
#build:
|
||||||
context: ./backend
|
#context: ./backend
|
||||||
dockerfile: Dockerfile
|
#dockerfile: Dockerfile
|
||||||
|
image: git.fawkes100.de/sebastian/timemanager/timemanager-backend:latest
|
||||||
links:
|
links:
|
||||||
- "db:app_db"
|
- "db:app_db"
|
||||||
environment:
|
environment:
|
||||||
@ -27,9 +28,10 @@ services:
|
|||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
- /etc/timezone:/etc/timezone:ro
|
||||||
frontend:
|
frontend:
|
||||||
build:
|
#build:
|
||||||
context: ./frontend
|
#context: ./frontend
|
||||||
dockerfile: Dockerfile
|
#dockerfile: Dockerfile
|
||||||
|
image: git.fawkes100.de/sebastian/timemanager/timemanager-frontend:latest
|
||||||
restart: always
|
restart: always
|
||||||
links:
|
links:
|
||||||
- backend:backend
|
- backend:backend
|
||||||
|
Loading…
Reference in New Issue
Block a user