Skip to content

Replacing cubied with run-cvmfs.sh (issue #20) #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kreczko wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replacing cubied with run-cvmfs.sh (issue #20) #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions cvmfs-base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ MAINTAINER Sebastien Binet "binet@cern.ch"
USER root
ENV USER root
ENV HOME /root
ENV CUBIED_VERSION 20160205

## make sure FUSE can be enabled
RUN if [[ ! -e /dev/fuse ]]; then mknod -m 666 /dev/fuse c 10 229; fi
Expand All @@ -31,32 +30,28 @@ RUN yum update -y && yum install -y \
RUN mkdir -p \
/cvmfs/cernvm-prod.cern.ch \
/cvmfs/sft.cern.ch \
/etc/cubie.d
;

RUN echo "cernvm-prod.cern.ch /cvmfs/cernvm-prod.cern.ch cvmfs defaults 0 0" >> /etc/fstab && \
echo "sft.cern.ch /cvmfs/sft.cern.ch cvmfs defaults 0 0" >> /etc/fstab

WORKDIR /root

## add files last (as this invalids caches)
ADD https://github.com/hepsw/cubie/releases/download/${CUBIED_VERSION}/cubied /usr/bin/cubied
ADD dot-pythonrc.py $HOME/.pythonrc.py

ADD etc-cvmfs-default-local /etc/cvmfs/default.local
ADD etc-cvmfs-domain-local /etc/cvmfs/domain.d/cern.ch.local
ADD etc-cvmfs-keys /etc/cvmfs/keys

ADD etc-cubied-cvmfs.conf /etc/cubie.d/cvmfs.conf
ADD run-cvmfs.sh /etc/cvmfs/run-cvmfs.sh

RUN chmod uga+rx \
/etc/cvmfs/run-cvmfs.sh \
/usr/bin/cubied \
;

## make the whole container seamlessly executable
ENTRYPOINT ["/usr/bin/cubied"]
ENTRYPOINT ["/etc/cvmfs/run-cvmfs.sh"]
CMD ["bash"]

## EOF

3 changes: 0 additions & 3 deletions cvmfs-base/etc-cubied-cvmfs.conf
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions cvmfs-base/run-cvmfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ cvmfs_config setup || exit 1
echo "::: mounting FUSE..."
mount -a
echo "::: mounting FUSE... [done]"

exec "$@"