Skip to content

Commit

Permalink
Upgrade HTCondor and Apptainer
Browse files Browse the repository at this point in the history
  • Loading branch information
@brianaydemir
brianaydemir committed May 22, 2024
1 parent c2ba069 commit bb27408
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 27 deletions.
6 changes: 3 additions & 3 deletions notebooks/htc-all-spark-notebook/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ RUN apt-get update -y \
#
# Install HTCondor.
#
&& curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-10.x-Key | apt-key add - \
&& echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/10.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
&& curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-23.x-Key | apt-key add - \
&& echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/23.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
&& apt-get update -y \
&& apt-get install -y minihtcondor \
#
Expand Down Expand Up @@ -144,7 +144,7 @@ RUN python3 -m pip install -U --no-cache-dir git+https://github.com/brianaydemir

USER root

ARG APPTAINER_VERSION=1.2.3
ARG APPTAINER_VERSION=1.3.1
ARG APPTAINER_DEB=apptainer_${APPTAINER_VERSION}_amd64.deb

RUN cd /tmp \
Expand Down
6 changes: 3 additions & 3 deletions notebooks/htc-base-notebook/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ RUN apt-get update -y \
#
# Install HTCondor.
#
&& curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-10.x-Key | apt-key add - \
&& echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/10.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
&& curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-23.x-Key | apt-key add - \
&& echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/23.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
&& apt-get update -y \
&& apt-get install -y minihtcondor \
#
Expand Down Expand Up @@ -144,7 +144,7 @@ RUN python3 -m pip install -U --no-cache-dir git+https://github.com/brianaydemir

USER root

ARG APPTAINER_VERSION=1.2.3
ARG APPTAINER_VERSION=1.3.1
ARG APPTAINER_DEB=apptainer_${APPTAINER_VERSION}_amd64.deb

RUN cd /tmp \
Expand Down
6 changes: 3 additions & 3 deletions notebooks/htc-datascience-notebook/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ RUN apt-get update -y \
#
# Install HTCondor.
#
&& curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-10.x-Key | apt-key add - \
&& echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/10.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
&& curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-23.x-Key | apt-key add - \
&& echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/23.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
&& apt-get update -y \
&& apt-get install -y minihtcondor \
#
Expand Down Expand Up @@ -144,7 +144,7 @@ RUN python3 -m pip install -U --no-cache-dir git+https://github.com/brianaydemir

USER root

ARG APPTAINER_VERSION=1.2.3
ARG APPTAINER_VERSION=1.3.1
ARG APPTAINER_DEB=apptainer_${APPTAINER_VERSION}_amd64.deb

RUN cd /tmp \
Expand Down
6 changes: 3 additions & 3 deletions notebooks/htc-minimal-notebook/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ RUN apt-get update -y \
#
# Install HTCondor.
#
&& curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-10.x-Key | apt-key add - \
&& echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/10.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
&& curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-23.x-Key | apt-key add - \
&& echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/23.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
&& apt-get update -y \
&& apt-get install -y minihtcondor \
#
Expand Down Expand Up @@ -144,7 +144,7 @@ RUN python3 -m pip install -U --no-cache-dir git+https://github.com/brianaydemir

USER root

ARG APPTAINER_VERSION=1.2.3
ARG APPTAINER_VERSION=1.3.1
ARG APPTAINER_DEB=apptainer_${APPTAINER_VERSION}_amd64.deb

RUN cd /tmp \
Expand Down
6 changes: 3 additions & 3 deletions notebooks/htc-pyspark-notebook/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ RUN apt-get update -y \
#
# Install HTCondor.
#
&& curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-10.x-Key | apt-key add - \
&& echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/10.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
&& curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-23.x-Key | apt-key add - \
&& echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/23.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
&& apt-get update -y \
&& apt-get install -y minihtcondor \
#
Expand Down Expand Up @@ -144,7 +144,7 @@ RUN python3 -m pip install -U --no-cache-dir git+https://github.com/brianaydemir

USER root

ARG APPTAINER_VERSION=1.2.3
ARG APPTAINER_VERSION=1.3.1
ARG APPTAINER_DEB=apptainer_${APPTAINER_VERSION}_amd64.deb

RUN cd /tmp \
Expand Down
6 changes: 3 additions & 3 deletions notebooks/htc-r-notebook/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ RUN apt-get update -y \
#
# Install HTCondor.
#
&& curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-10.x-Key | apt-key add - \
&& echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/10.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
&& curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-23.x-Key | apt-key add - \
&& echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/23.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
&& apt-get update -y \
&& apt-get install -y minihtcondor \
#
Expand Down Expand Up @@ -144,7 +144,7 @@ RUN python3 -m pip install -U --no-cache-dir git+https://github.com/brianaydemir

USER root

ARG APPTAINER_VERSION=1.2.3
ARG APPTAINER_VERSION=1.3.1
ARG APPTAINER_DEB=apptainer_${APPTAINER_VERSION}_amd64.deb

RUN cd /tmp \
Expand Down
6 changes: 3 additions & 3 deletions notebooks/htc-scipy-notebook/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ RUN apt-get update -y \
#
# Install HTCondor.
#
&& curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-10.x-Key | apt-key add - \
&& echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/10.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
&& curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-23.x-Key | apt-key add - \
&& echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/23.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
&& apt-get update -y \
&& apt-get install -y minihtcondor \
#
Expand Down Expand Up @@ -144,7 +144,7 @@ RUN python3 -m pip install -U --no-cache-dir git+https://github.com/brianaydemir

USER root

ARG APPTAINER_VERSION=1.2.3
ARG APPTAINER_VERSION=1.3.1
ARG APPTAINER_DEB=apptainer_${APPTAINER_VERSION}_amd64.deb

RUN cd /tmp \
Expand Down
6 changes: 3 additions & 3 deletions notebooks/htc-tensorflow-notebook/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ RUN apt-get update -y \
#
# Install HTCondor.
#
&& curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-10.x-Key | apt-key add - \
&& echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/10.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
&& curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-23.x-Key | apt-key add - \
&& echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/23.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
&& apt-get update -y \
&& apt-get install -y minihtcondor \
#
Expand Down Expand Up @@ -144,7 +144,7 @@ RUN python3 -m pip install -U --no-cache-dir git+https://github.com/brianaydemir

USER root

ARG APPTAINER_VERSION=1.2.3
ARG APPTAINER_VERSION=1.3.1
ARG APPTAINER_DEB=apptainer_${APPTAINER_VERSION}_amd64.deb

RUN cd /tmp \
Expand Down
6 changes: 3 additions & 3 deletions template/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ RUN apt-get update -y \
#
# Install HTCondor.
#
&& curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-10.x-Key | apt-key add - \
&& echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/10.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
&& curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-23.x-Key | apt-key add - \
&& echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/23.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
&& apt-get update -y \
&& apt-get install -y minihtcondor \
#
Expand Down Expand Up @@ -144,7 +144,7 @@ RUN python3 -m pip install -U --no-cache-dir git+https://github.com/brianaydemir

USER root

ARG APPTAINER_VERSION=1.2.3
ARG APPTAINER_VERSION=1.3.1
ARG APPTAINER_DEB=apptainer_${APPTAINER_VERSION}_amd64.deb

RUN cd /tmp \
Expand Down

0 comments on commit bb27408

Please sign in to comment.