Skip to content

Commit 8c9603e

Browse files
author
Rub21
committed
Update base container value for replication contianer and others
1 parent 901f98c commit 8c9603e

File tree

6 files changed

+26
-25
lines changed

6 files changed

+26
-25
lines changed

envs/.env.cloudprovider.example

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ GCP_STORAGE_BUCKET=osm-seed
1616

1717
# Azure
1818
AZURE_STORAGE_ACCOUNT=osmseed
19-
AZURE_STORAGE_ACCESS_KEY=xyz..
20-
AZURE_STORAGE_CONNECT_STRING=abc..
21-
AZURE_CONTAINER_NAME=osm-seed
19+
AZURE_CONTAINER_NAME=osm-seed
20+
AZURE_STORAGE_ACCESS_KEY=...
21+
AZURE_STORAGE_CONNECTION_STRING=...

images/full-history/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM developmentseed/osmseed-osm-processor:0.1.0-n487.hbce9469
1+
FROM developmentseed/osmseed-osm-processor:v2
22

33
VOLUME /mnt/data
44
COPY ./start.sh /

images/planet-dump/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM developmentseed/osmseed-osm-processor:latest
1+
FROM developmentseed/osmseed-osm-processor:v2
22

33
VOLUME /mnt/data
44
COPY ./start.sh /

images/populate-apidb/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM developmentseed/osmseed-osm-processor:0.1.0-n497.h0368039
1+
FROM developmentseed/osmseed-osm-processor:v2
22

33
VOLUME /mnt/data
44
COPY ./start.sh /

images/replication-job/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM developmentseed/osmseed-osm-processor:ohm-7dd7b8a
1+
FROM developmentseed/osmseed-osm-processor:v2
2+
23
COPY ./start.sh /
34
WORKDIR /mnt/data
45
CMD /start.sh

images/replication-job/start.sh

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ if [ ! -f $workingDirectory/state.txt ]; then
3939
if [[ $state_file_exists=="true" ]]; then
4040
echo "File exist, let's get it from $CLOUDPROVIDER - $AZURE_CONTAINER_NAME"
4141
az storage blob download \
42-
--container-name $AZURE_CONTAINER_NAME \
43-
--name $REPLICATION_FOLDER/state.txt \
44-
--file $workingDirectory/state.txt --query="name"
42+
--container-name $AZURE_CONTAINER_NAME \
43+
--name $REPLICATION_FOLDER/state.txt \
44+
--file $workingDirectory/state.txt --query="name"
4545
fi
4646
fi
4747
mkdir -p $workingDirectory
@@ -50,17 +50,17 @@ fi
5050
# Creating the replication files
5151
function generateReplication() {
5252
osmosis -q \
53-
--replicate-apidb \
54-
iterations=0 \
55-
minInterval=60000 \
56-
maxInterval=120000 \
57-
host=$POSTGRES_HOST \
58-
database=$POSTGRES_DB \
59-
user=$POSTGRES_USER \
60-
password=$POSTGRES_PASSWORD \
61-
validateSchemaVersion=no \
62-
--write-replication \
63-
workingDirectory=$workingDirectory &
53+
--replicate-apidb \
54+
iterations=0 \
55+
minInterval=60000 \
56+
maxInterval=120000 \
57+
host=$POSTGRES_HOST \
58+
database=$POSTGRES_DB \
59+
user=$POSTGRES_USER \
60+
password=$POSTGRES_PASSWORD \
61+
validateSchemaVersion=no \
62+
--write-replication \
63+
workingDirectory=$workingDirectory &
6464
while true; do
6565
for local_file in $(find $workingDirectory/ -cmin -1); do
6666
if [ -f "$local_file" ]; then
@@ -83,10 +83,10 @@ function generateReplication() {
8383
if [ $CLOUDPROVIDER == "azure" ]; then
8484
#TODO, emable public acces
8585
az storage blob upload \
86-
--container-name $AZURE_CONTAINER_NAME \
87-
--file $local_file \
88-
--name $cloud_file \
89-
--output none
86+
--container-name $AZURE_CONTAINER_NAME \
87+
--file $local_file \
88+
--name $cloud_file \
89+
--output none
9090
fi
9191
fi
9292
done

0 commit comments

Comments
 (0)