Skip to content

Commit ca6a5a1

Browse files
author
Ruben Lopez M
authored
Merge pull request #205 from developmentseed/fix_tm
Add Tasking manager in docker-compose and fix the tzlocal issue
2 parents 388e29e + 3042992 commit ca6a5a1

File tree

4 files changed

+20
-4
lines changed

4 files changed

+20
-4
lines changed

docker-compose.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,4 +222,19 @@ services:
222222
volumes:
223223
- ./overpass-api-db:/db
224224
env_file:
225-
- ./.env-overpass
225+
- ./.env-overpass
226+
227+
######################################################
228+
### Tasking Manager section
229+
######################################################
230+
tasking-manager-api:
231+
image: osmseed-tasking-manager-api:v1
232+
build:
233+
context: ./images/tasking-manager-api
234+
dockerfile: Dockerfile
235+
ports:
236+
- '5000:5000'
237+
volumes:
238+
- ./tasking-manager-api-db:/db
239+
env_file:
240+
- ./.env-tasking-manager

images/replication-job/start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ else
88
echo JAVACMD_OPTIONS=\"-server -Xmx$memory\" >~/.osmosis
99
fi
1010

11-
workingDirectory="data"
11+
workingDirectory="/mnt/data/data"
1212

1313
# Check if state.txt exist in the workingDirectory,
1414
# in case the file does not exist locally and does not exist in the cloud the replication will start from 0

images/tasking-manager-api/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ENV workdir /usr/src/app
77

88
RUN git clone https://github.com/hotosm/tasking-manager.git $workdir
99
# Commits on Oct 23, 2020
10-
RUN cd $workdir && git checkout 951039f86938b9cc9d8b6986c4e5f3423a78e4d3
10+
RUN cd $workdir && git checkout -f 951039f86938b9cc9d8b6986c4e5f3423a78e4d3
1111
WORKDIR $workdir
1212

1313
# Setup backend dependencies
@@ -25,6 +25,7 @@ RUN apk update && \
2525
proj-dev
2626

2727
RUN pip install -r requirements.txt
28+
RUN pip install apscheduler==3.7.0
2829

2930
## INITIALIZATION
3031
EXPOSE 5000

osm-seed/templates/replication-job-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
containers:
2222
- name: {{ .Release.Name }}-replication-job-deployment
2323
image: {{ .Values.replicationJob.image.name }}:{{ .Values.replicationJob.image.tag }}
24-
command: ['./start.sh']
24+
command: ['/start.sh']
2525
{{- if .Values.replicationJob.resources.enabled }}
2626
resources:
2727
requests:

0 commit comments

Comments
 (0)