diff options
| author | Manuel Reithuber <git@manuel.reithuber.net> | 2017-03-07 12:37:52 +0100 |
|---|---|---|
| committer | Manuel Reithuber <git@manuel.reithuber.net> | 2017-03-07 12:37:52 +0100 |
| commit | 4cf7da9021bf00e7a40a69c51359ca70677b356e (patch) | |
| tree | efb5db928ab7cb4da47ab61b2f4315f8d1224906 | |
| parent | 1611c91663a5f3c3b5148152baf1ea95b56bdc68 (diff) | |
| parent | 39f737f351dfee39238ee72cf5d882544afc5820 (diff) | |
| download | gluster-4cf7da9021bf00e7a40a69c51359ca70677b356e.tar.gz gluster-4cf7da9021bf00e7a40a69c51359ca70677b356e.tar.bz2 gluster-4cf7da9021bf00e7a40a69c51359ca70677b356e.tar.xz gluster-4cf7da9021bf00e7a40a69c51359ca70677b356e.zip | |
Merge branch 'master' of https://github.com/gluster/gluster-containers
| -rw-r--r-- | CentOS/Dockerfile | 13 | ||||
| -rw-r--r-- | CentOS/gluster-setup.service | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/CentOS/Dockerfile b/CentOS/Dockerfile index 69c1376..7c0d448 100644 --- a/CentOS/Dockerfile +++ b/CentOS/Dockerfile @@ -24,6 +24,14 @@ RUN sed -i '/Defaults requiretty/c\#Defaults requiretty' /etc/sudoers # Changing the port of sshd to avoid conflicting with host sshd RUN sed -i '/Port 22/c\Port 2222' /etc/ssh/sshd_config +# Fixing RPC port conflict issue +RUN sed -i 's/Requires\=rpcbind\.service//g' /usr/lib/systemd/system/glusterd.service + +RUN sed -i 's/rpcbind\.service/gluster-setup\.service/g' /usr/lib/systemd/system/glusterd.service + +# Fix for the separate /var on host issue +RUN sed -i 's/ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0"/ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="systemd_end"/g' /usr/lib/udev/rules.d/99-systemd.rules + # Backing up gluster config as it overlaps when bind mounting. RUN mkdir -p /etc/glusterfs_bkp /var/lib/glusterd_bkp /var/log/glusterfs_bkp;\ cp -r /etc/glusterfs/* /etc/glusterfs_bkp;\ @@ -43,12 +51,13 @@ RUN chmod 644 /etc/systemd/system/gluster-setup.service ADD gluster-setup.sh /usr/sbin/gluster-setup.sh RUN chmod 500 /usr/sbin/gluster-setup.sh -RUN echo 'root:password' | chpasswd +#RUN echo 'root:password' | chpasswd VOLUME [ "/sys/fs/cgroup" ] RUN systemctl disable nfs-server.service +# stops getty from consuming all the memory +RUN systemctl mask getty.target RUN systemctl enable ntpd.service -RUN systemctl enable rpcbind.service RUN systemctl enable glusterd.service RUN systemctl enable gluster-setup.service diff --git a/CentOS/gluster-setup.service b/CentOS/gluster-setup.service index 4cccd57..4bb8b68 100644 --- a/CentOS/gluster-setup.service +++ b/CentOS/gluster-setup.service @@ -1,6 +1,6 @@ [Unit] Description=Configuring GlusterFS in container -Before=rpcbind.service +Before=glusterd.service [Service] Type=oneshot |