Skip to content
Snippets Groups Projects
Commit 055fd87f authored by Eric Cano's avatar Eric Cano
Browse files

Added symlinking of buildtree in bin/lib.

Fixed home directory not readable (prevented the frontend from running).
Added installation of CASTOR's rmcd to the image.
parent 40eb6fb8
No related branches found
No related tags found
No related merge requests found
Showing
with 66 additions and 2 deletions
...@@ -9,6 +9,7 @@ passwd eric ...@@ -9,6 +9,7 @@ passwd eric
cat >> /etc/sudoers << EOFsudoers cat >> /etc/sudoers << EOFsudoers
eric ALL=(ALL) NOPASSWD: ALL eric ALL=(ALL) NOPASSWD: ALL
EOFsudoers EOFsudoers
chmod a+rx ~eric
sudo -u eric cp /vmBootstrap/gitScripts/.git-* ~eric/ sudo -u eric cp /vmBootstrap/gitScripts/.git-* ~eric/
cat /vmBootstrap/gitScripts/bash_profile.hook >> ~eric/.bash_profile cat /vmBootstrap/gitScripts/bash_profile.hook >> ~eric/.bash_profile
sudo -u eric cp /vmBootstrap/tigConf/tigrc ~eric/.tigrc sudo -u eric cp /vmBootstrap/tigConf/tigrc ~eric/.tigrc
......
#!/bin/bash #!/bin/bash
/opt/run/bin/init_pod.sh
cat <<EOF > /etc/cta/cta-cli.conf cat <<EOF > /etc/cta/cta-cli.conf
# The CTA frontend address in the form <FQDN>:<TCPPort> # The CTA frontend address in the form <FQDN>:<TCPPort>
# solved by kubernetes DNS server so KIS... # solved by kubernetes DNS server so KIS...
......
#!/bin/sh #!/bin/sh
/opt/run/bin/init_pod.sh
yes | cp -r /opt/ci/ctafrontend/etc / yes | cp -r /opt/ci/ctafrontend/etc /
/opt/run/bin/init_objectstore.sh /opt/run/bin/init_objectstore.sh
......
#!/bin/sh #!/bin/sh
/opt/run/bin/init_pod.sh
echo "Using this configuration for library:" echo "Using this configuration for library:"
/opt/run/bin/init_library.sh /opt/run/bin/init_library.sh
cat /tmp/library-rc.sh cat /tmp/library-rc.sh
......
...@@ -8,3 +8,6 @@ echo "DONE" ...@@ -8,3 +8,6 @@ echo "DONE"
#echo -n "Yum should resolve names using IPv4 DNS: " #echo -n "Yum should resolve names using IPv4 DNS: "
#echo "ip_resolve=IPv4" >> /etc/yum.conf #echo "ip_resolve=IPv4" >> /etc/yum.conf
#echo "DONE" #echo "DONE"
# Here we will symlink the builtree's contents to /usr/bin and /usr/lib64.
/opt/run/bin/mkSymlinks.sh
...@@ -9,6 +9,7 @@ cat /tmp/library-rc.sh ...@@ -9,6 +9,7 @@ cat /tmp/library-rc.sh
. /tmp/library-rc.sh . /tmp/library-rc.sh
# to get rmcd logs to stdout # to get rmcd logs to stdout
mkdir -p /var/log/castor
mkfifo /var/log/castor/rmcd_legacy.log mkfifo /var/log/castor/rmcd_legacy.log
for ((;;)); do cat </var/log/castor/rmcd_legacy.log; done & for ((;;)); do cat </var/log/castor/rmcd_legacy.log; done &
disown disown
......
...@@ -70,7 +70,7 @@ tail -F /cta-taped.log & ...@@ -70,7 +70,7 @@ tail -F /cta-taped.log &
# working correctly # working correctly
echo BUILDTREE_BASE=${BUILDTREE_BASE} echo BUILDTREE_BASE=${BUILDTREE_BASE}
echo BUILDTREE_SUBDIR=${BUILDTREE_SUBDIR} echo BUILDTREE_SUBDIR=${BUILDTREE_SUBDIR}
runuser -c "${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/tapeserver/cta-taped ${CTA_TAPED_OPTIONS}" runuser -c "/usr/bin/cta-taped ${CTA_TAPED_OPTIONS}"
echo "taped died" echo "taped died"
......
...@@ -55,6 +55,8 @@ RUN yum install -y \ ...@@ -55,6 +55,8 @@ RUN yum install -y \
# Populate local repository and enable it, then install any rpm that is needed for # Populate local repository and enable it, then install any rpm that is needed for
# any container. Finally add needed directories. # any container. Finally add needed directories.
RUN yum-config-manager --enable epel --setopt="epel.priority=4" \ RUN yum-config-manager --enable epel --setopt="epel.priority=4" \
&& \
yum-config-manager --enable castor \
&& \ && \
yum install -y\ yum install -y\
eos-client \ eos-client \
...@@ -81,6 +83,7 @@ RUN yum-config-manager --enable epel --setopt="epel.priority=4" \ ...@@ -81,6 +83,7 @@ RUN yum-config-manager --enable epel --setopt="epel.priority=4" \
protobuf3 \ protobuf3 \
cryptopp \ cryptopp \
json-c \ json-c \
castor-rmc-server \
&& \ && \
yum clean all \ yum clean all \
&& \ && \
......
...@@ -71,7 +71,7 @@ tail -F /cta-taped.log & ...@@ -71,7 +71,7 @@ tail -F /cta-taped.log &
# cta-taped is ran with runuser to avoid a bug with Docker that prevents both # cta-taped is ran with runuser to avoid a bug with Docker that prevents both
# the setresgid(-1, 1474, -1) and setresuid(-1, 14029, -1) system calls from # the setresgid(-1, 1474, -1) and setresuid(-1, 14029, -1) system calls from
# working correctly # working correctly
runuser -c "/bin/cta-taped ${CTA_TAPED_OPTIONS}" runuser -c "/usr/bin/cta-taped ${CTA_TAPED_OPTIONS}"
echo "taped died" echo "taped died"
......
...@@ -21,6 +21,16 @@ spec: ...@@ -21,6 +21,16 @@ spec:
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: INSTANCE_NAME - name: INSTANCE_NAME
value: "$(MY_NAMESPACE)" value: "$(MY_NAMESPACE)"
- name: BUILDTREE_BASE
valueFrom:
configMapKeyRef:
name: buildtree
key: base
- name: BUILDTREE_SUBDIR
valueFrom:
configMapKeyRef:
name: buildtree
key: subdir
- name: TERM - name: TERM
value: "xterm" value: "xterm"
command: ['/opt/run/bin/ctacli.sh'] command: ['/opt/run/bin/ctacli.sh']
......
...@@ -23,6 +23,16 @@ spec: ...@@ -23,6 +23,16 @@ spec:
value: "$(MY_NAMESPACE)" value: "$(MY_NAMESPACE)"
- name: frontend - name: frontend
value: 'cta-frontend:10955' value: 'cta-frontend:10955'
- name: BUILDTREE_BASE
valueFrom:
configMapKeyRef:
name: buildtree
key: base
- name: BUILDTREE_SUBDIR
valueFrom:
configMapKeyRef:
name: buildtree
key: subdir
- name: TERM - name: TERM
value: "xterm" value: "xterm"
command: ['/opt/run/bin/ctaeos-mgm.sh'] command: ['/opt/run/bin/ctaeos-mgm.sh']
......
...@@ -21,6 +21,16 @@ spec: ...@@ -21,6 +21,16 @@ spec:
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: INSTANCE_NAME - name: INSTANCE_NAME
value: "$(MY_NAMESPACE)" value: "$(MY_NAMESPACE)"
- name: BUILDTREE_BASE
valueFrom:
configMapKeyRef:
name: buildtree
key: base
- name: BUILDTREE_SUBDIR
valueFrom:
configMapKeyRef:
name: buildtree
key: subdir
- name: TERM - name: TERM
value: "xterm" value: "xterm"
command: ['/opt/run/bin/ctafrontend.sh'] command: ['/opt/run/bin/ctafrontend.sh']
......
...@@ -31,6 +31,16 @@ spec: ...@@ -31,6 +31,16 @@ spec:
configMapKeyRef: configMapKeyRef:
name: init name: init
key: keepobjectstore key: keepobjectstore
- name: BUILDTREE_BASE
valueFrom:
configMapKeyRef:
name: buildtree
key: base
- name: BUILDTREE_SUBDIR
valueFrom:
configMapKeyRef:
name: buildtree
key: subdir
command: ['/opt/run/bin/init.sh'] command: ['/opt/run/bin/init.sh']
args: ["none"] args: ["none"]
volumeMounts: volumeMounts:
......
...@@ -21,6 +21,16 @@ spec: ...@@ -21,6 +21,16 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: BUILDTREE_BASE
valueFrom:
configMapKeyRef:
name: buildtree
key: base
- name: BUILDTREE_SUBDIR
valueFrom:
configMapKeyRef:
name: buildtree
key: subdir
- name: INSTANCE_NAME - name: INSTANCE_NAME
value: "$(MY_NAMESPACE)" value: "$(MY_NAMESPACE)"
- name: TERM - name: TERM
......
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