From 37cb8dcf5f67e45b43a5a47d12d9fd13d91533e9 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Tue, 30 Apr 2024 12:06:34 -0500 Subject: [PATCH 1/2] Move db files for taginfo --- images/taginfo/start.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/taginfo/start.sh b/images/taginfo/start.sh index 2733a50e..3acbc53a 100755 --- a/images/taginfo/start.sh +++ b/images/taginfo/start.sh @@ -64,6 +64,8 @@ compress_files() { download_db_files() { if ! aws s3 ls "s3://$AWS_S3_BUCKET/$ENVIRONMENT" 2>&1 | grep -q 'An error occurred'; then aws s3 sync "s3://$AWS_S3_BUCKET/$ENVIRONMENT/" "$DATADIR/" + mv $DATADIR/*.db $DATADIR/ + mv $DATADIR/*/*.db $DATADIR/ compress_files fi } From 743bea55bd12ebc442e12612bc8ccc95c52c6733 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Wed, 1 May 2024 14:25:01 -0500 Subject: [PATCH 2/2] Update taginfo script --- images/taginfo/start.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/images/taginfo/start.sh b/images/taginfo/start.sh index 3acbc53a..69efd057 100755 --- a/images/taginfo/start.sh +++ b/images/taginfo/start.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +set -x WORKDIR=/usr/src/app DATADIR=/usr/src/app/data DATADOWNLOAD=/osm/planet/var @@ -39,14 +40,14 @@ process_data() { db/update.sh $DATADIR master/update.sh $DATADIR projects/update.sh $DATADIR - # # languages/update.sh $DATADIR - # # wiki/update.sh $DATADIR - # # wikidata/update.sh $DATADIR + cp $DATADIR/selection.db $DATADIR/../ + # languages/update.sh $DATADIR + # wiki/update.sh $DATADIR + # wikidata/update.sh $DATADIR chronology/update.sh $DATADIR ./update_all.sh $DATADIR mv $DATADIR/*.db $DATADIR/ mv $DATADIR/*/*.db $DATADIR/ - # if BUCKET_NAME is set upload data if ! aws s3 ls "s3://$BUCKET_NAME/$ENVIRONMENT" 2>&1 | grep -q 'An error occurred'; then aws s3 sync $DATADIR/ s3://$AWS_S3_BUCKET/$ENVIRONMENT/ --exclude "*" --include "*.db" @@ -64,8 +65,6 @@ compress_files() { download_db_files() { if ! aws s3 ls "s3://$AWS_S3_BUCKET/$ENVIRONMENT" 2>&1 | grep -q 'An error occurred'; then aws s3 sync "s3://$AWS_S3_BUCKET/$ENVIRONMENT/" "$DATADIR/" - mv $DATADIR/*.db $DATADIR/ - mv $DATADIR/*/*.db $DATADIR/ compress_files fi }