-
Notifications
You must be signed in to change notification settings - Fork 135
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.
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
[WIP] Changes for monitoring support using tendrl project. #60
base: master
Are you sure you want to change the base?
[WIP] Changes for monitoring support using tendrl project. #60
Conversation
- Add repos and install relevant packages. - enable relevant services - Expose corresponding ports Signed-off-by: Saravanakumar Arumugam <sarumuga@redhat.com>
Add tendrl-collectd-selinux tendrl-selinux packages. Signed-off-by: Saravanakumar Arumugam <sarumuga@redhat.com>
till import(and then installing). Signed-off-by: Saravanakumar Arumugam <sarumuga@redhat.com>
CentOS/Dockerfile
Outdated
@@ -47,6 +47,17 @@ systemctl enable ntpd.service; \ | |||
systemctl enable glusterd.service; \ | |||
systemctl enable gluster-setup.service; | |||
|
|||
EXPOSE 2222 111 245 443 24007 2049 8080 6010 6011 6012 38465 38466 38468 38469 49152 49153 49154 49156 49157 49158 49159 49160 49161 49162 | |||
RUN yum --setopt=tsflags=nodocs -y install epel-release; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is generally not recommended to include multple RUN statements like this, since this will cause the image size to grow rapidly in size. Using ; \
syntax like above (or, preferably, && \
like in the Fedora container) is much more efficient.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done. merging RUN install commands.
CentOS/Dockerfile
Outdated
@@ -47,6 +47,17 @@ systemctl enable ntpd.service; \ | |||
systemctl enable glusterd.service; \ | |||
systemctl enable gluster-setup.service; | |||
|
|||
EXPOSE 2222 111 245 443 24007 2049 8080 6010 6011 6012 38465 38466 38468 38469 49152 49153 49154 49156 49157 49158 49159 49160 49161 49162 | |||
RUN yum --setopt=tsflags=nodocs -y install epel-release; | |||
ADD tendrl/tendrl-release-epel-7.repo /etc/yum.repos.d/tendrl-release-epel-7.repo |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You shouldn't need to use ADD
for these, I'd suggest COPY
instead. I'd also suggest moving the file-adding lines above the RUN
statements.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done. making it as COPY
Use COPY instead of ADD yum clean after install Signed-off-by: Saravanakumar Arumugam <sarumuga@redhat.com>
CentOS/Dockerfile
Outdated
RUN systemctl enable tendrl-node-agent | ||
RUN sed -i.bak '/^etcd_connection/s/:.*/:\ tendrlserver/' /etc/tendrl/node-agent/node-agent.conf.yaml | ||
RUN sed -i.bak '/^graphite_host/s/:.*/:\ tendrlserver/' /etc/tendrl/node-agent/node-agent.conf.yaml | ||
RUN sed -i.bak '/^SELINUX\b/s/=.*/=permissive/' /etc/selinux/config |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Merge these RUN statements into the previous one as well. Probably do the systemctl call last.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
Signed-off-by: Saravanakumar Arumugam <sarumuga@redhat.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just one more small suggestion which can be ignored. :) LGTM!
CentOS/Dockerfile
Outdated
@@ -47,6 +47,17 @@ systemctl enable ntpd.service; \ | |||
systemctl enable glusterd.service; \ | |||
systemctl enable gluster-setup.service; | |||
|
|||
EXPOSE 2222 111 245 443 24007 2049 8080 6010 6011 6012 38465 38466 38468 38469 49152 49153 49154 49156 49157 49158 49159 49160 49161 49162 | |||
COPY tendrl/tendrl-release-epel-7.repo /etc/yum.repos.d/tendrl-release-epel-7.repo | |||
COPY tendrl/tendrl-dependencies-epel-7.repo /etc/yum.repos.d/tendrl-dependencies-epel-7.repo |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OH, I just noticed something... you don't have to do this if you don't want to, so I'll just make this a comment, but you COULD do the following:
COPY tendrl/tendrl-release-epel-7.repo \
tendrl/tendrl-dependencies-epel-7.repo \
/etc/yum.repos.d/
This is slightly more efficient for the build and produces a slightly smaller image layer stack.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
Signed-off-by: Saravanakumar Arumugam <sarumuga@redhat.com>
Kindly is there already an OpenShift matching version about this pull request ? |
Signed-off-by: Saravanakumar Arumugam sarumuga@redhat.com