Skip to content

Commit ed0975b

Browse files
committed
stuff
1 parent f887b80 commit ed0975b

File tree

4 files changed

+41
-31
lines changed

4 files changed

+41
-31
lines changed

ci/htcondor/Dockerfile

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# We intentionally use full-length digests (NOT tags) for reproducibility.
2+
# FROM ghcr.io/juliaparallel/dask-jobqueue-ci-images:htcondor-submit as submit
3+
FROM ghcr.io/juliaparallel/dask-jobqueue-ci-images@sha256:5ada6445b5d8b53b6693ab86be364dd1ce385ada8e53763731ba50d145f0350d as submit
4+
5+
# We intentionally have no default value:
6+
ARG JULIA_VERSION
7+
8+
RUN mkdir -p /home/docker/.local/opt/julia \
9+
&& cd /home/docker/.local/opt/julia \
10+
&& folder="$(echo 1.11.2 | cut -d. -f1-2)" \
11+
&& curl -L https://julialang-s3.julialang.org/bin/linux/x64/1.11/julia-1.11.2-linux-x86_64.tar.gz | tar xz --strip 1 \
12+
&& /home/docker/.local/opt/julia/bin/julia --version
13+
14+
ENV PATH="/home/docker/.local/opt/julia/bin:${PATH}"
15+
16+
COPY --chown=docker . SlurmClusterManager
17+
18+
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
19+
20+
# We intentionally use full-length digests (NOT tags) for reproducibility.
21+
# FROM ghcr.io/juliaparallel/dask-jobqueue-ci-images:htcondor-execute as execute
22+
FROM ghcr.io/juliaparallel/dask-jobqueue-ci-images@sha256:5723d0380f627779bc54a31ebac9a77f0937189453f597845411257dea6ac0db as execute
23+
24+
# We intentionally have no default value:
25+
ARG JULIA_VERSION
26+
27+
RUN mkdir -p /home/docker/.local/opt/julia \
28+
&& cd /home/docker/.local/opt/julia \
29+
&& folder="$(echo 1.11.2 | cut -d. -f1-2)" \
30+
&& curl -L https://julialang-s3.julialang.org/bin/linux/x64/1.11/julia-1.11.2-linux-x86_64.tar.gz | tar xz --strip 1 \
31+
&& /home/docker/.local/opt/julia/bin/julia --version
32+
33+
ENV PATH="/home/docker/.local/opt/julia/bin:${PATH}"
34+
35+
COPY --chown=docker . SlurmClusterManager

ci/htcondor/Dockerfile.execute.derived

Lines changed: 0 additions & 13 deletions
This file was deleted.

ci/htcondor/Dockerfile.submit.derived

Lines changed: 0 additions & 13 deletions
This file was deleted.

ci/htcondor/docker-compose.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@ services:
2020
command: bash -c 'condor_store_cred -p password -f /root/secrets/pool_password ; exec bash -x /start.sh'
2121

2222
submit:
23-
# We intentionally use full-length digests (NOT tags) for reproducibility.
24-
# image: ghcr.io/juliaparallel/dask-jobqueue-ci-images:htcondor-submit
23+
image: ghcr.io/juliaparallel/dask-jobqueue-ci-images@sha256:5ada6445b5d8b53b6693ab86be364dd1ce385ada8e53763731ba50d145f0350d
2524
build:
2625
context: ../..
2726
dockerfile: ci/htcondor/Dockerfile.submit.derived
28-
# target: submit
27+
target: submit
2928
hostname: submit.htcondor
3029
environment:
3130
- CONDOR_HOST=cm
@@ -40,10 +39,11 @@ services:
4039
- shared_space:/shared_space
4140

4241
execute1:
42+
image: ghcr.io/juliaparallel/dask-jobqueue-ci-images@sha256:5723d0380f627779bc54a31ebac9a77f0937189453f597845411257dea6ac0db
4343
build:
4444
context: ../..
4545
dockerfile: ci/htcondor/Dockerfile.submit.derived
46-
# target: execute
46+
target: execute
4747
hostname: execute1.htcondor
4848
environment:
4949
- CONDOR_HOST=cm
@@ -56,10 +56,11 @@ services:
5656
- shared_space:/shared_space
5757

5858
execute2:
59+
image: ghcr.io/juliaparallel/dask-jobqueue-ci-images@sha256:5723d0380f627779bc54a31ebac9a77f0937189453f597845411257dea6ac0db
5960
build:
6061
context: ../..
6162
dockerfile: ci/htcondor/Dockerfile.submit.derived
62-
# target: execute
63+
target: execute
6364
hostname: execute2.htcondor
6465
environment:
6566
- CONDOR_HOST=cm

0 commit comments

Comments
 (0)