From b6db382c3c5d9977c59ef8dd42a891703c98b5f2 Mon Sep 17 00:00:00 2001 From: Eraldo Jr Date: Fri, 30 Aug 2019 14:43:55 -0300 Subject: [PATCH 1/2] #1 clone localfolder and grid_accounts repos --- sh/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sh/Dockerfile b/sh/Dockerfile index 4c90208..6c8dfbb 100644 --- a/sh/Dockerfile +++ b/sh/Dockerfile @@ -16,7 +16,7 @@ RUN yum -y install fetch-crl globus-rsl empty-ca-certs RUN yum install -y vim less ## net tools ## -RUN yum install -y net-tools iproute openssh openssh-server openssh-clients openssl-libs tcpdump +RUN yum install -y net-tools iproute openssh openssh-server openssh-clients openssl-libs tcpdump git ## default users ## RUN useradd -m test @@ -24,8 +24,11 @@ RUN adduser -m condor_user RUN mkdir -p /etc/grid-security/ RUN rpm -Uvh http://yum.puppet.com/puppet5-release-el-7.noarch.rpm RUN yum install -y puppet-agent +RUN /opt/puppetlabs/bin/puppet module install puppet-fetchcrl --version 3.0.0 RUN /opt/puppetlabs/bin/puppet module install HEPPuppet-argus --version 0.0.3 RUN /opt/puppetlabs/bin/puppet module install HEPPuppet-htcondor --version 2.4.3 +RUN git clone https://github.com/HEP-Puppet/puppet-localfolder +RUN git clone https://github.com/HEP-Puppet/puppet-grid_accounts/tree/master/manifests ## mount point for SIMPLE Grid Framework ## From bc58c2de95d25ce30b4f0064f3ed7464d5355647 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 30 Aug 2019 20:12:42 +0200 Subject: [PATCH 2/2] #1 clone repos on /temp dir --- sh/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sh/Dockerfile b/sh/Dockerfile index 6c8dfbb..60add79 100644 --- a/sh/Dockerfile +++ b/sh/Dockerfile @@ -27,8 +27,8 @@ RUN yum install -y puppet-agent RUN /opt/puppetlabs/bin/puppet module install puppet-fetchcrl --version 3.0.0 RUN /opt/puppetlabs/bin/puppet module install HEPPuppet-argus --version 0.0.3 RUN /opt/puppetlabs/bin/puppet module install HEPPuppet-htcondor --version 2.4.3 -RUN git clone https://github.com/HEP-Puppet/puppet-localfolder -RUN git clone https://github.com/HEP-Puppet/puppet-grid_accounts/tree/master/manifests +RUN git clone https://github.com/HEP-Puppet/puppet-localfolder /tmp/puppet-localfolder +RUN git clone https://github.com/HEP-Puppet/puppet-grid_accounts /tmp/puppet-grid_accounts ## mount point for SIMPLE Grid Framework ## @@ -47,4 +47,4 @@ rm -f /lib/systemd/system/basic.target.wants/*;\ rm -f /lib/systemd/system/anaconda.target.wants/*; VOLUME [ "/sys/fs/cgroup" ] -CMD ["/usr/sbin/init"] \ No newline at end of file +CMD ["/usr/sbin/init"]