Skip to content

Commit

Permalink
Merge branch 'stfc:master' into patch-11
Browse files Browse the repository at this point in the history
  • Loading branch information
Jo-stfc authored Dec 13, 2024
2 parents 3e96b98 + 843e98c commit 24df7d5
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 3 deletions.
3 changes: 2 additions & 1 deletion docker-c8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ RUN dnf -y install \
quota \
attr \
tcsh \
numactl
numactl \
bc

# Create all possible pool accounts
RUN curl -s https://raw.githubusercontent.com/stfc/grid-workernode/master/resources/pool_accounts/create.sh | bash -
Expand Down
3 changes: 2 additions & 1 deletion docker-c9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ RUN dnf -y install \
quota \
attr \
tcsh \
numactl
numactl \
bc

# Create all possible pool accounts
RUN curl -s https://raw.githubusercontent.com/stfc/grid-workernode/master/resources/pool_accounts/create.sh | bash -
Expand Down
1 change: 1 addition & 0 deletions resources/pool_accounts/groups.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,4 @@
35564 t1-ui
35570 fermilab
35571 comet
35572 moedal
20 changes: 20 additions & 0 deletions resources/pool_accounts/users.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -2878,3 +2878,23 @@
35862 comet018 35571 comet pool account /home/pool/comet018 /bin/bash
35863 comet019 35571 comet pool account /home/pool/comet019 /bin/bash
35864 comet020 35571 comet pool account /home/pool/comet020 /bin/bash
35865 moedal001 35572 moedal pool account /home/pool/moedal001 /bin/bash
35866 moedal002 35572 moedal pool account /home/pool/moedal002 /bin/bash
35867 moedal003 35572 moedal pool account /home/pool/moedal003 /bin/bash
35868 moedal004 35572 moedal pool account /home/pool/moedal004 /bin/bash
35869 moedal005 35572 moedal pool account /home/pool/moedal005 /bin/bash
35870 moedal006 35572 moedal pool account /home/pool/moedal006 /bin/bash
35871 moedal007 35572 moedal pool account /home/pool/moedal007 /bin/bash
35872 moedal008 35572 moedal pool account /home/pool/moedal008 /bin/bash
35873 moedal009 35572 moedal pool account /home/pool/moedal009 /bin/bash
35874 moedal010 35572 moedal pool account /home/pool/moedal010 /bin/bash
35875 moedal011 35572 moedal pool account /home/pool/moedal011 /bin/bash
35876 moedal012 35572 moedal pool account /home/pool/moedal012 /bin/bash
35877 moedal013 35572 moedal pool account /home/pool/moedal013 /bin/bash
35878 moedal014 35572 moedal pool account /home/pool/moedal014 /bin/bash
35879 moedal015 35572 moedal pool account /home/pool/moedal015 /bin/bash
35880 moedal016 35572 moedal pool account /home/pool/moedal016 /bin/bash
35881 moedal017 35572 moedal pool account /home/pool/moedal017 /bin/bash
35882 moedal018 35572 moedal pool account /home/pool/moedal018 /bin/bash
35883 moedal019 35572 moedal pool account /home/pool/moedal019 /bin/bash
35884 moedal020 35572 moedal pool account /home/pool/moedal020 /bin/bash
4 changes: 3 additions & 1 deletion xrootd/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ RUN dnf -y versionlock add ceph-${CEPH_VERSION}.el8.x86_64 \
xrootd-server-${XROOTD_VERSION}.el8.x86_64 \
xrootd-server-libs-${XROOTD_VERSION}.el8.x86_64 \
xrootd-ceph-buffered-${XRDCEPH_VERSION}.el8.x86_64 \
xrootd-voms-${XROOTD_VERSION}.el8.x86_64
xrootd-voms-${XROOTD_VERSION}.el8.x86_64 \
xrootd-scitokens-${XROOTD_VERSION}.el8.x86_64

RUN dnf -y versionlock list

Expand All @@ -63,6 +64,7 @@ RUN dnf -y install xrootd-ceph-buffered \
xrootd-server \
xrootd-server-libs \
xrootd-voms \
xrootd-scitokens \
jemalloc


Expand Down

0 comments on commit 24df7d5

Please sign in to comment.