From 1c8d32f1a3c34508f2fec30b2dcb15f11697eb0a Mon Sep 17 00:00:00 2001 From: Rub21 Date: Fri, 4 Oct 2024 19:08:59 -0500 Subject: [PATCH 1/3] Test osm-processor --- chartpress.yaml | 80 ++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/chartpress.yaml b/chartpress.yaml index 388d0d44..d7a9af3a 100644 --- a/chartpress.yaml +++ b/chartpress.yaml @@ -6,46 +6,46 @@ charts: published: https://devseed.com/osm-seed-chart images: - web: - valuesPath: web.image - db: - valuesPath: db.image - backup-restore: - valuesPath: dbBackupRestore.image - planet-dump: - valuesPath: planetDump.image - full-history: - valuesPath: fullHistory.image - replication-job: - valuesPath: replicationJob.image - populate-apidb: - valuesPath: populateApidb.image + # web: + # valuesPath: web.image + # db: + # valuesPath: db.image + # backup-restore: + # valuesPath: dbBackupRestore.image + # planet-dump: + # valuesPath: planetDump.image + # full-history: + # valuesPath: fullHistory.image + # replication-job: + # valuesPath: replicationJob.image + # populate-apidb: + # valuesPath: populateApidb.image osm-processor: valuesPath: osmProcessor.image - tiler-db: - valuesPath: tilerDb.image - tiler-imposm: - valuesPath: tilerImposm.image - tiler-server: - valuesPath: tilerServer.image - tasking-manager-api: - valuesPath: tmApi.image - # tiler-visor: - # valuesPath: tilerVisor.image - nominatim: - valuesPath: nominatimApi.image - overpass-api: - valuesPath: overpassApi.image - taginfo: - valuesPath: taginfo.image - osm-simple-metrics: - valuesPath: osmSimpleMetrics.image - changeset-replication-job: - valuesPath: changesetReplicationJob.image - osmcha-web: - valuesPath: osmchaWeb.image - osmcha-db: - valuesPath: osmchaDb.image - planet-files: - valuesPath: planetFiles.image + # tiler-db: + # valuesPath: tilerDb.image + # tiler-imposm: + # valuesPath: tilerImposm.image + # tiler-server: + # valuesPath: tilerServer.image + # tasking-manager-api: + # valuesPath: tmApi.image + # # tiler-visor: + # # valuesPath: tilerVisor.image + # nominatim: + # valuesPath: nominatimApi.image + # overpass-api: + # valuesPath: overpassApi.image + # taginfo: + # valuesPath: taginfo.image + # osm-simple-metrics: + # valuesPath: osmSimpleMetrics.image + # changeset-replication-job: + # valuesPath: changesetReplicationJob.image + # osmcha-web: + # valuesPath: osmchaWeb.image + # osmcha-db: + # valuesPath: osmchaDb.image + # planet-files: + # valuesPath: planetFiles.image From 362976603b846406904e01611fc73cdfd6657b29 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Fri, 4 Oct 2024 19:15:56 -0500 Subject: [PATCH 2/3] Update osm-processor base image for replication job and others --- chartpress.yaml | 82 +++++++++++++++---------------- images/full-history/Dockerfile | 2 +- images/planet-dump/Dockerfile | 2 +- images/populate-apidb/Dockerfile | 2 +- images/replication-job/Dockerfile | 2 +- 5 files changed, 45 insertions(+), 45 deletions(-) diff --git a/chartpress.yaml b/chartpress.yaml index d7a9af3a..dcda4e83 100644 --- a/chartpress.yaml +++ b/chartpress.yaml @@ -4,48 +4,48 @@ charts: repo: git: developmentseed/osm-seed-chart published: https://devseed.com/osm-seed-chart - + images: - # web: - # valuesPath: web.image - # db: - # valuesPath: db.image - # backup-restore: - # valuesPath: dbBackupRestore.image - # planet-dump: - # valuesPath: planetDump.image - # full-history: - # valuesPath: fullHistory.image - # replication-job: - # valuesPath: replicationJob.image - # populate-apidb: - # valuesPath: populateApidb.image + web: + valuesPath: web.image + db: + valuesPath: db.image + backup-restore: + valuesPath: dbBackupRestore.image + planet-dump: + valuesPath: planetDump.image + full-history: + valuesPath: fullHistory.image + replication-job: + valuesPath: replicationJob.image + populate-apidb: + valuesPath: populateApidb.image osm-processor: valuesPath: osmProcessor.image - # tiler-db: - # valuesPath: tilerDb.image - # tiler-imposm: - # valuesPath: tilerImposm.image - # tiler-server: - # valuesPath: tilerServer.image - # tasking-manager-api: - # valuesPath: tmApi.image - # # tiler-visor: - # # valuesPath: tilerVisor.image - # nominatim: - # valuesPath: nominatimApi.image - # overpass-api: - # valuesPath: overpassApi.image - # taginfo: - # valuesPath: taginfo.image - # osm-simple-metrics: - # valuesPath: osmSimpleMetrics.image - # changeset-replication-job: - # valuesPath: changesetReplicationJob.image - # osmcha-web: - # valuesPath: osmchaWeb.image - # osmcha-db: - # valuesPath: osmchaDb.image - # planet-files: - # valuesPath: planetFiles.image + tiler-db: + valuesPath: tilerDb.image + tiler-imposm: + valuesPath: tilerImposm.image + tiler-server: + valuesPath: tilerServer.image + tasking-manager-api: + valuesPath: tmApi.image + # tiler-visor: + # valuesPath: tilerVisor.image + nominatim: + valuesPath: nominatimApi.image + overpass-api: + valuesPath: overpassApi.image + taginfo: + valuesPath: taginfo.image + osm-simple-metrics: + valuesPath: osmSimpleMetrics.image + changeset-replication-job: + valuesPath: changesetReplicationJob.image + osmcha-web: + valuesPath: osmchaWeb.image + osmcha-db: + valuesPath: osmchaDb.image + planet-files: + valuesPath: planetFiles.image diff --git a/images/full-history/Dockerfile b/images/full-history/Dockerfile index 056f4ba0..3f40d16a 100644 --- a/images/full-history/Dockerfile +++ b/images/full-history/Dockerfile @@ -1,4 +1,4 @@ -FROM developmentseed/osmseed-osm-processor:v3 +FROM developmentseed/osmseed-osm-processor:0.1.0-n795.h1c8d32f VOLUME /mnt/data COPY ./start.sh / diff --git a/images/planet-dump/Dockerfile b/images/planet-dump/Dockerfile index 056f4ba0..3f40d16a 100644 --- a/images/planet-dump/Dockerfile +++ b/images/planet-dump/Dockerfile @@ -1,4 +1,4 @@ -FROM developmentseed/osmseed-osm-processor:v3 +FROM developmentseed/osmseed-osm-processor:0.1.0-n795.h1c8d32f VOLUME /mnt/data COPY ./start.sh / diff --git a/images/populate-apidb/Dockerfile b/images/populate-apidb/Dockerfile index 935e51cc..68f0fd56 100644 --- a/images/populate-apidb/Dockerfile +++ b/images/populate-apidb/Dockerfile @@ -1,4 +1,4 @@ -FROM developmentseed/osmseed-osm-processor:v3 +FROM developmentseed/osmseed-osm-processor:0.1.0-n795.h1c8d32f VOLUME /mnt/data COPY ./start.sh / diff --git a/images/replication-job/Dockerfile b/images/replication-job/Dockerfile index aa7e6fdd..6ea7a53d 100644 --- a/images/replication-job/Dockerfile +++ b/images/replication-job/Dockerfile @@ -1,4 +1,4 @@ -FROM developmentseed/osmseed-osm-processor:v3 +FROM developmentseed/osmseed-osm-processor:0.1.0-n795.h1c8d32f # Install Nginx RUN apt-get update && \ From 42e9c1eacc5a24485f7fca8b7bdfd95e1b85d1bd Mon Sep 17 00:00:00 2001 From: Rub21 Date: Fri, 4 Oct 2024 19:46:00 -0500 Subject: [PATCH 3/3] Update replication job container --- images/replication-job/Dockerfile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/images/replication-job/Dockerfile b/images/replication-job/Dockerfile index 6ea7a53d..5594a3f7 100644 --- a/images/replication-job/Dockerfile +++ b/images/replication-job/Dockerfile @@ -1,12 +1,16 @@ FROM developmentseed/osmseed-osm-processor:0.1.0-n795.h1c8d32f -# Install Nginx RUN apt-get update && \ - apt-get install -y nginx && \ + apt-get install -y nginx python3-pip python3-venv && \ rm -rf /var/lib/apt/lists/* - -RUN pip3 install boto3 + +RUN python3 -m venv /opt/venv +ENV PATH="/opt/venv/bin:$PATH" +RUN pip install --no-cache-dir boto3 + COPY ./*.sh / COPY monitoring.py / + WORKDIR /mnt/data -CMD /start.sh + +CMD /start.sh \ No newline at end of file