Skip to content

Commit

Permalink
Always use the last stashcp release
Browse files Browse the repository at this point in the history
  • Loading branch information
@rynge
rynge committed Jul 18, 2023
1 parent bb02b95 commit ab0261e
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
8 changes: 5 additions & 3 deletions htc/debian:12/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,11 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && \
rm -rf /var/lib/apt/lists/*

# stashcp
RUN wget -nv https://github.com/htcondor/osdf-client/releases/download/v6.12.1/stashcp-6.12.1-1_amd64.deb && \
apt install ./stashcp-*_amd64.deb && \
rm -f stashcp-*_amd64.deb
RUN URL=$(curl -L -s https://api.github.com/repos/htcondor/osdf-client/releases/latest | grep -E "browser_download_url.*/stashcp.*amd64.deb" | head -n 1 | cut -d : -f 2,3 | tr -d \") && \
echo "Picked stashcp version: $URL ..." && \
curl -L -o stashcp.deb $URL && \
apt install ./stashcp.deb && \
rm -f stashcp.deb

RUN mkdir -p /.singularity.d
COPY osg-labels.json /.singularity.d/labels.json
Expand Down
8 changes: 5 additions & 3 deletions htc/ubuntu:20.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,11 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && \
rm -rf /var/lib/apt/lists/*

# stashcp
RUN wget -nv https://github.com/htcondor/osdf-client/releases/download/v6.12.1/stashcp-6.12.1-1_amd64.deb && \
apt install ./stashcp-*_amd64.deb && \
rm -f stashcp-*_amd64.deb
RUN URL=$(curl -L -s https://api.github.com/repos/htcondor/osdf-client/releases/latest | grep -E "browser_download_url.*/stashcp.*amd64.deb" | head -n 1 | cut -d : -f 2,3 | tr -d \") && \
echo "Picked stashcp version: $URL ..." && \
curl -L -o stashcp.deb $URL && \
apt install ./stashcp.deb && \
rm -f stashcp.deb

# build info
RUN echo "Timestamp:" `date --utc` | tee /image-build-info.txt
Expand Down
8 changes: 5 additions & 3 deletions htc/ubuntu:22.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,11 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && \
rm -rf /var/lib/apt/lists/*

# stashcp
RUN wget -nv https://github.com/htcondor/osdf-client/releases/download/v6.12.1/stashcp-6.12.1-1_amd64.deb && \
apt install ./stashcp-*_amd64.deb && \
rm -f stashcp-*_amd64.deb
RUN URL=$(curl -L -s https://api.github.com/repos/htcondor/osdf-client/releases/latest | grep -E "browser_download_url.*/stashcp.*amd64.deb" | head -n 1 | cut -d : -f 2,3 | tr -d \") && \
echo "Picked stashcp version: $URL ..." && \
curl -L -o stashcp.deb $URL && \
apt install ./stashcp.deb && \
rm -f stashcp.deb

# build info
RUN echo "Timestamp:" `date --utc` | tee /image-build-info.txt
Expand Down

0 comments on commit ab0261e

Please sign in to comment.