Skip to content
Snippets Groups Projects
Commit 13811fb3 authored by Daniel Lyons's avatar Daniel Lyons
Browse files

Bump HTCondor version to match SCG

parent 00961ad9
No related branches found
No related tags found
1 merge request!553Bump HTCondor version to match SCG
Pipeline #3271 passed
##
## Default security settings
##
## Host-based security was the default for the 8.8 series (and earlier).
##
## Host-based security assumes that all users on a machine are trusted.
## For example, if host-based security trusts that a given machine can
## run jobs, then any user who can start a process on that machine can
## start a startd that can "steal" jobs from the system.
#
## To help make HTCondor secure by default, we removed host-based security
## from the default configuration file
## (/etc/condor/condor_config).
##
## New installations of HTCondor should be made using the get_htcondor tool,
## which can automatically establish IDTOKENS-based security across a multi-
## node pool. For existing installations, we recommend you
## consider improving your security configuration.
##
## To continue to use your old security configuration,
## comment out the 'recommended' line below, and uncomment the
## 'host_based' line.
##
use security:host_based
#use security:recommended_v9_0
\ No newline at end of file
CONDOR_HOST = condor-cm
use security:host_based
# Give all permissions to all connecting parties (this is a security risk, but since this pool is local-only I think it's fine -nhertz)
ALLOW_WRITE = *
ALLOW_READ = *
......
# Condor central manager image
FROM htcondor/cm:8.9.6-el7
FROM htcondor/cm:9.0.6-el7
# Copy HTCondor config file
COPY ./config/htcondor/00-htcondor-9.0.config /etc/condor/config.d/00-htcondor-9.0.config
COPY ./config/htcondor/99-workspaces.conf /root/config/99-workspaces.conf
# Apply config within the container
......
# Condor execute node image
FROM htcondor/execute:8.9.6-el7
FROM htcondor/execute:9.0.6-el7
# Copy HTCondor config file
COPY ./config/htcondor/00-htcondor-9.0.config /etc/condor/config.d/00-htcondor-9.0.config
COPY ./config/htcondor/99-workspaces.conf /root/config/99-workspaces.conf
COPY ./config/htcondor/execute/boot-execute.sh /root/bin/boot-execute.sh
......
CONDOR_HOST = condor-cm
use security:host_based
use ROLE : Submit
# Give all permissions to all connecting parties (this is a security risk, but since this pool is local-only I think it's fine -nhertz)
......
......@@ -9,12 +9,11 @@ ENV ENV=${env}
USER root
# HTCondor install
RUN apt update && apt install -y wget gnupg sudo
RUN wget -qO - https://research.cs.wisc.edu/htcondor/debian/HTCondor-Release.gpg.key | sudo apt-key add -
RUN echo "deb http://research.cs.wisc.edu/htcondor/debian/8.8/buster buster contrib" > /etc/apt/sources.list.d/htcondor.list
RUN echo "deb-src http://research.cs.wisc.edu/htcondor/debian/8.8/buster buster contrib" >> /etc/apt/sources.list.d/htcondor.list
RUN sudo apt update
RUN sudo apt install -y htcondor
RUN apt update && apt install -y curl gnupg apt-transport-https
RUN curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-9.0-Key | apt-key add -
RUN echo "deb [arch=amd64] https://research.cs.wisc.edu/htcondor/repo/debian/9.0 buster main" > /etc/apt/sources.list.d/htcondor.list
RUN echo "deb-src https://research.cs.wisc.edu/htcondor/repo/debian/9.0 buster main" >> /etc/apt/sources.list.d/htcondor.list
RUN apt update && apt install -y procps htcondor
# HTCondor setup
# Copy over HTCondor submit node config
......
......@@ -14,15 +14,15 @@ RUN python setup.py develop --user
USER root
# HTCondor install
RUN apt update && apt install -y wget gnupg sudo
RUN wget -qO - https://research.cs.wisc.edu/htcondor/debian/HTCondor-Release.gpg.key | sudo apt-key add -
RUN echo "deb http://research.cs.wisc.edu/htcondor/debian/8.8/buster buster contrib" > /etc/apt/sources.list.d/htcondor.list
RUN echo "deb-src http://research.cs.wisc.edu/htcondor/debian/8.8/buster buster contrib" >> /etc/apt/sources.list.d/htcondor.list
RUN sudo apt update
RUN sudo apt install -y htcondor
RUN apt update && apt install -y curl gnupg apt-transport-https
RUN curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-9.0-Key | apt-key add -
RUN echo "deb [arch=amd64] https://research.cs.wisc.edu/htcondor/repo/debian/9.0 buster main" > /etc/apt/sources.list.d/htcondor.list
RUN echo "deb-src https://research.cs.wisc.edu/htcondor/repo/debian/9.0 buster main" >> /etc/apt/sources.list.d/htcondor.list
RUN apt update && apt install -y procps htcondor
# HTCondor setup
# Copy over HTCondor submit node config
COPY ./config/htcondor/00-htcondor-9.0.config /etc/condor/config.d/00-htcondor-9.0.config
COPY ./config/htcondor/submit/99-workspaces-submit.conf /etc/condor/config.d/99-workspaces-submit.conf
# Set Capo
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment