Docker for beta delivery

docker/Dockerfile

@@ -1,20 +1,21 @@
-##### General instruction: ######
-#docker build -f ./Dockerfile -t opera-adt/compass:latest . #To build the docker image
-#to run docker container in interactive mode: docker run -it --name COMPASS opera-adt/compass:latest /bin/bash
-
 FROM ubuntu:22.04
 
 LABEL author="OPERA ADT" \
-      description="s1 cslc 0.1.0 point release" \
-      version="interface_0.1"
+      description="s1 cslc 0.2 Beta release" \
+      version="0.2-beta"
 
 RUN apt-get -y update &&\
     apt-get -y install curl git &&\
     adduser --disabled-password compass_user
 
-USER compass_user 
 
-COPY docker/specifile.txt /home/compass_user/
+USER root
+COPY . /home/compass_user/OPERA/COMPASS
+
+RUN chown -R compass_user:compass_user /home/compass_user/OPERA &&\
+    chmod -R 755 /home/compass_user
+
+USER compass_user 
 
 ENV CONDA_PREFIX=/home/compass_user/miniconda3
 
@@ -23,37 +24,24 @@ RUN curl -sSL https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64
     bash miniconda.sh -b -p ${CONDA_PREFIX} &&\
     rm $HOME/miniconda.sh
 
-ENV PATH="${CONDA_PREFIX}/bin:${PATH}"
-RUN $CONDA_PREFIX/bin/conda init bash
+ENV PATH=${CONDA_PREFIX}/bin:${PATH}
+RUN ${CONDA_PREFIX}/bin/conda init bash
 
-RUN conda create --name "COMPASS" --file specifile.txt
+RUN conda create --name "COMPASS" --file /home/compass_user/OPERA/COMPASS/docker/specifile.txt
 
 SHELL ["conda", "run", "-n", "COMPASS", "/bin/bash", "-c"]
 
 RUN echo "Installing OPERA s1-reader" &&\
-    mkdir -p $HOME/OPERA &&\
-    cd $HOME/OPERA &&\
-    curl -sSL https://github.com/opera-adt/s1-reader/archive/refs/tags/v0.1.2.tar.gz -o s1_reader_src.tar.gz &&\
+    cd ${HOME}/OPERA &&\
+    curl -sSL https://github.com/opera-adt/s1-reader/archive/refs/tags/v0.1.4.tar.gz -o s1_reader_src.tar.gz &&\
     tar -xvf s1_reader_src.tar.gz &&\
-    ln -s s1-reader-0.1.2 s1-reader &&\
+    ln -s s1-reader-0.1.4 s1-reader &&\
     rm s1_reader_src.tar.gz &&\
-    python -m pip install ./s1-reader
-
-COPY . /home/compass_user/OPERA/COMPASS
-
-USER root
-RUN chown -R compass_user:compass_user /home/compass_user/OPERA/COMPASS
-USER compass_user
-
-RUN echo "Installing OPERA COMPASS" &&\
-    cd $HOME/OPERA &&\
+    python -m pip install ./s1-reader &&\
+    echo "Installing OPERA COMPASS" &&\
     python -m pip install ./COMPASS &&\
-    mkdir -p /home/compass_user/scratch &&\
-    chmod -R o+rwx /home/compass_user/scratch &&\
     echo "conda activate COMPASS" >> /home/compass_user/.bashrc
 
-
 WORKDIR /home/compass_user/scratch
 
-#for COMPASS 0.1.1 and future releases
-ENTRYPOINT ["conda", "run", "-n", "COMPASS","s1_cslc.py"]
+ENTRYPOINT ["conda", "run", "--no-capture-output", "-n", "COMPASS"]

setup.cfg

@@ -29,3 +29,4 @@ where = src
 console_scripts =
     s1_cslc.py = compass.s1_cslc:main
     s1_geocode_stack.py = compass.s1_geocode_stack:main
+    validate_cslc.py = compass.utils.validate_cslc:main

src/compass/s1_geocode_slc.py

@@ -26,7 +26,6 @@ def run(cfg: GeoRunConfig):
     '''
     Run geocode burst workflow with user-defined
     args stored in dictionary runconfig *cfg*
-
     Parameters
     ---------
     cfg: GeoRunConfig

src/compass/utils/lut.py

@@ -2,7 +2,6 @@ def compute_geocoding_correction_luts(burst, rg_step=200, az_step=0.25):
     '''
     Compute slant range and azimuth LUTs corrections
     to be applied during burst geocoding
-
     Parameters
     ----------
     burst: Sentinel1BurstSlc
@@ -11,7 +10,6 @@ def compute_geocoding_correction_luts(burst, rg_step=200, az_step=0.25):
         LUT spacing (in pixels) along x/slant range in meters
     ystep: int
         LUT spacing (in pixels) along x/azimuth in seconds
-
     Returns
     -------
     rg_lut: ndarray
@@ -26,4 +24,4 @@ def compute_geocoding_correction_luts(burst, rg_step=200, az_step=0.25):
     rg_lut = rg_doppler
     az_lut = az_bistatic.data
 
-    return rg_lut, az_lut
+    return rg_lut, az_lut

src/compass/utils/validate_cslc.py

@@ -199,7 +199,8 @@ def compare_cslc_metadata(file_ref, file_sec):
         assert not set_ref_minus_sec or not set_sec_minus_ref, err_str
 
 
-if __name__ == '__main__':
+def main():
+    '''Entrypoint of the script'''
     cmd = cmd_line_parser()
 
     # Check CSLC products
@@ -209,3 +210,6 @@ def compare_cslc_metadata(file_ref, file_sec):
     # Check CSLC metadata
     compare_cslc_metadata(cmd.ref_product, cmd.sec_product)
     print('All CSLC metadata checks have passed')
+
+if __name__ == '__main__':
+    main()

src/compass/version.py

@@ -1,11 +1,14 @@
-# release history
+'''
+release history
+'''
 
 import collections
 
 
 # release history
 Tag = collections.namedtuple('Tag', 'version date')
 release_history = (
+    Tag('0.1.3', '2022-12-20'),
     Tag('0.1.2', '2022-07-21'),
     Tag('0.1.1', '2022-06-08'),
     Tag('0.1.0', '2022-06-07'),
@@ -14,4 +17,3 @@
 # latest release version number and date
 release_version = release_history[0].version
 release_date = release_history[0].date
-