Skip to content

Commit

Permalink
Patch release 240315 (#219)
Browse files Browse the repository at this point in the history
* bump up the version; update Dockerfile with ISCE3 build

* revise script to build Docker; revise Dockerfile with ISCE3 build; update s1reader version

* add `.pre-commit-config.yaml`

---------

Co-authored-by: Seongsu Jeong <[email protected]>
  • Loading branch information
seongsujeong and Seongsu Jeong authored Mar 15, 2024
1 parent c9ca4ef commit 16a3c1d
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 12 deletions.
7 changes: 7 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
hooks:
- id: check-added-large-files
16 changes: 16 additions & 0 deletions build_docker_image.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#! /bin/bash

REPO=opera
IMAGE=cslc_s1
TAG=final_0.5.5

echo "IMAGE is $REPO/$IMAGE:$TAG"

rm docker/dockerimg_cslc_s1_${TAG}.tar

# fail on any non-zero exit codes
set -ex

docker build --rm --force-rm --network host -t $REPO/$IMAGE:$TAG -f docker/Dockerfile.isce3_builder .

docker save $REPO/$IMAGE:$TAG > docker/dockerimg_cslc_s1_${TAG}.tar
14 changes: 7 additions & 7 deletions docker/Dockerfile.isce3_builder
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
FROM oraclelinux:8

LABEL author="OPERA ADT" \
description="s1 cslc 0.3.2 point release" \
version="0.3.2-point"
description="s1 cslc 0.5.5 patch release" \
version="0.5.5-final_point"

RUN yum -y update &&\
yum -y install curl git make unzip &&\
Expand Down Expand Up @@ -44,29 +44,29 @@ SHELL ["conda", "run", "-n", "COMPASS", "/bin/bash", "-c"]
RUN mkdir -p /home/compass_user/OPERA/ISCE3/install &&\
mkdir -p /home/compass_user/OPERA/ISCE3/build &&\
cd /home/compass_user/OPERA/ISCE3 &&\
curl -sSL https://github.com/isce-framework/isce3/archive/refs/tags/v0.14.0.zip -o isce3_sourcecode.zip &&\
curl -sSL https://github.com/isce-framework/isce3/archive/refs/tags/v0.15.1.zip -o isce3_sourcecode.zip &&\
unzip isce3_sourcecode.zip &&\
rm isce3_sourcecode.zip &&\
cd /home/compass_user/OPERA/ISCE3/build &&\
cmake -DCMAKE_INSTALL_PREFIX=/home/compass_user/OPERA/ISCE3/install -DWITH_CUDA=OFF /home/compass_user/OPERA/ISCE3/isce3-0.14.0 &&\
cmake -DCMAKE_INSTALL_PREFIX=/home/compass_user/OPERA/ISCE3/install -DWITH_CUDA=OFF -DCMAKE_BUILD_TYPE=Release /home/compass_user/OPERA/ISCE3/isce3-0.15.1 &&\
make -j32 VERBOSE=ON &&\
make install &&\
rm -rf /home/compass_user/OPERA/ISCE3/build/* &&\
cd $CONDA_PREFIX/lib &&\
find /home/compass_user/OPERA/ISCE3/install/lib64 -name "*.so*" -exec ln -s {} \; &&\
cd `find $CONDA_PREFIX -name "site-packages"|sort|tail -1` &&\
find /home/compass_user/OPERA/ISCE3/install/packages -maxdepth 1 -type d|sort|awk 'NR>1'|xargs -I{} ln -s {} &&\
rm -rf /home/compass_user/OPERA/ISCE3/isce3-0.14.0 &&\
rm -rf /home/compass_user/OPERA/ISCE3/isce3-0.15.1 &&\
rm -rf /home/compass_user/OPERA/ISCE3/build

WORKDIR /home/compass_user/OPERA
# Install ISCE3


# installing OPERA s1-reader
RUN curl -sSL https://github.com/opera-adt/s1-reader/archive/refs/tags/v0.1.7.tar.gz -o s1_reader_src.tar.gz &&\
RUN curl -sSL https://github.com/opera-adt/s1-reader/archive/refs/tags/v0.2.4.tar.gz -o s1_reader_src.tar.gz &&\
tar -xvf s1_reader_src.tar.gz &&\
ln -s s1-reader-0.1.7 s1-reader &&\
ln -s s1-reader-0.2.4 s1-reader &&\
rm s1_reader_src.tar.gz &&\
python -m pip install ./s1-reader

Expand Down
5 changes: 0 additions & 5 deletions docker/build_docker_image.sh

This file was deleted.

1 change: 1 addition & 0 deletions src/compass/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
# release history
Tag = collections.namedtuple('Tag', 'version date')
release_history = (
Tag('0.5.5', '2024-03-15'),
Tag('0.5.4', '2023-10-13'),
Tag('0.5.3', '2023-10-05'),
Tag('0.5.2', '2023-09-21'),
Expand Down

0 comments on commit 16a3c1d

Please sign in to comment.