From 05cb94f5fc0609321fa970279fa2b4e4aa29a3d4 Mon Sep 17 00:00:00 2001
From: "algodeveloper1@free.fr" <algodeveloper1@free.fr>
Date: Wed, 27 Jan 2021 10:54:51 +0000
Subject: [PATCH] change name read_s2 to readstwo
---
Dockerfile | 6 +++---
conf/configuration.properties | 2 +-
src/read_s2.out | 9 ---------
src/{reads2.py => readstwo.py} | 14 +++++++-------
4 files changed, 11 insertions(+), 20 deletions(-)
delete mode 100644 src/read_s2.out
rename src/{reads2.py => readstwo.py} (95%)
diff --git a/Dockerfile b/Dockerfile
index 2d21d4c..37242a8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM kosted/bmap-stack:latest
RUN sudo pip install wget
-WORKDIR /projects/reads2
-ADD . /projects/reads2
+WORKDIR /projects/readstwo
+ADD . /projects/readstwo
-ENTRYPOINT ["python3", "/projects/reads2/src/reads2.py"]
+ENTRYPOINT ["python3", "/projects/readstwo/src/readstwo.py"]
diff --git a/conf/configuration.properties b/conf/configuration.properties
index d6131be..49ef976 100644
--- a/conf/configuration.properties
+++ b/conf/configuration.properties
@@ -3,7 +3,7 @@ s2_folder = S2A_MSIL2A_20201129T110421_N0214_R094_T30TXQ_20201129T135030.SAFE
# Outputs
-output = /tmp/data/reads2/
+output = /projects/data/readstwo/
bands_10m = Bands_10m.pkl
bands_20m = Bands_20m.pkl
bands_60m = Bands_60m.pkl
diff --git a/src/read_s2.out b/src/read_s2.out
deleted file mode 100644
index b16c7f4..0000000
--- a/src/read_s2.out
+++ /dev/null
@@ -1,9 +0,0 @@
-nohup: ignoring input
-The configuration file is loaded
-Download DONE
-Tile path : /tmp/S2A_MSIL2A_20201129T110421_N0214_R094_T30TXQ_20201129T135030.SAFE
-Bands_10m.pkl : Done
-Bands_20m.pkl : Done
-Bands_60m.pkl : Done
-Tile_metadata.pkl : Done
-Mask_esa.plk : Done
diff --git a/src/reads2.py b/src/readstwo.py
similarity index 95%
rename from src/reads2.py
rename to src/readstwo.py
index 999e77c..c0116a2 100644
--- a/src/reads2.py
+++ b/src/readstwo.py
@@ -5,7 +5,7 @@ if __name__ == '__main__':
##########################################################################
import os, sys, fnmatch
import numpy as np
- os.sys.path.append('/tmp/reads2/src')
+ os.sys.path.append('/tmp/readstwo/src')
import re
from properties.p import Property
@@ -16,8 +16,8 @@ if __name__ == '__main__':
import glob
- if os.path.isfile('/projects/reads2/conf/configuration.properties'):
- configfile='/projects/reads2/conf/configuration.properties'
+ if os.path.isfile('/projects/readstwo/conf/configuration.properties'):
+ configfile='/projects/readstwo/conf/configuration.properties'
prop=Property()
prop_dict=prop.load_property_files(configfile)
print("The configuration file is loaded")
@@ -32,20 +32,20 @@ if __name__ == '__main__':
S3_url = 'https://oss.eu-west-0.prod-cloud-ocb.orange-business.com/bmap-catalogue-data/bmaap_test/'
s2_folder_tar_url = S3_url + s2_folder_tar
- s2_folder_tar_path = '/tmp/' + s2_folder_tar
- s2_folder_path = '/tmp/' + s2_folder
+ s2_folder_tar_path = output_path + s2_folder_tar
+ s2_folder_path = output_path + s2_folder
if not os.path.exists(s2_folder_path):
if not os.path.exists(s2_folder_tar_path):
wget.download(s2_folder_tar_url, s2_folder_tar_path)
tar = tarfile.open(s2_folder_tar_path)
- tar.extractall('/tmp/')
+ tar.extractall(output_path)
tar.close()
os.remove(s2_folder_tar_path)
print('Download DONE')
else:
tar = tarfile.open(s2_folder_tar_path)
- tar.extractall('/tmp/')
+ tar.extractall(output_path)
tar.close()
print('Download already DONE')
--
GitLab