From fe5918672f76ec5f68aa006f570304c1bc582804 Mon Sep 17 00:00:00 2001
From: Seongsu Jeong <seongsu.jeong@jpl.nasa.gov>
Date: Tue, 13 Dec 2022 14:32:35 -0800
Subject: [PATCH] Dockerfile renamed

---
 docker/Dockerfile      | 10 ++++-----
 docker/beta.Dockerfile | 47 ------------------------------------------
 2 files changed, 5 insertions(+), 52 deletions(-)
 delete mode 100644 docker/beta.Dockerfile

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8779d693..475e20b4 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,8 +1,8 @@
 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 &&\
@@ -33,9 +33,9 @@ SHELL ["conda", "run", "-n", "COMPASS", "/bin/bash", "-c"]
 
 RUN echo "Installing OPERA s1-reader" &&\
     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 &&\
+    curl -sSL https://github.com/opera-adt/s1-reader/archive/refs/tags/v0.1.3.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.3 s1-reader &&\
     rm s1_reader_src.tar.gz &&\
     python -m pip install ./s1-reader &&\
     echo "Installing OPERA COMPASS" &&\
@@ -44,4 +44,4 @@ RUN echo "Installing OPERA s1-reader" &&\
 
 WORKDIR /home/compass_user/scratch
 
-ENTRYPOINT ["conda", "run", "-n", "COMPASS","s1_cslc.py"]
+ENTRYPOINT ["conda", "run", "--no-capture-output", "-n", "COMPASS", "s1_cslc.py"]
diff --git a/docker/beta.Dockerfile b/docker/beta.Dockerfile
deleted file mode 100644
index 475e20b4..00000000
--- a/docker/beta.Dockerfile
+++ /dev/null
@@ -1,47 +0,0 @@
-FROM ubuntu:22.04
-
-LABEL author="OPERA ADT" \
-      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 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
-
-WORKDIR /home/compass_user
-RUN curl -sSL https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -o miniconda.sh &&\
-    bash miniconda.sh -b -p ${CONDA_PREFIX} &&\
-    rm $HOME/miniconda.sh
-
-ENV PATH=${CONDA_PREFIX}/bin:${PATH}
-RUN ${CONDA_PREFIX}/bin/conda init bash
-
-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" &&\
-    cd ${HOME}/OPERA &&\
-    curl -sSL https://github.com/opera-adt/s1-reader/archive/refs/tags/v0.1.3.tar.gz -o s1_reader_src.tar.gz &&\
-    tar -xvf s1_reader_src.tar.gz &&\
-    ln -s s1-reader-0.1.3 s1-reader &&\
-    rm s1_reader_src.tar.gz &&\
-    python -m pip install ./s1-reader &&\
-    echo "Installing OPERA COMPASS" &&\
-    python -m pip install ./COMPASS &&\
-    echo "conda activate COMPASS" >> /home/compass_user/.bashrc
-
-WORKDIR /home/compass_user/scratch
-
-ENTRYPOINT ["conda", "run", "--no-capture-output", "-n", "COMPASS", "s1_cslc.py"]