Skip to content
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

Jump to bottom

[WIP] Changes for monitoring support using tendrl project. #60

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

[WIP] Changes for monitoring support using tendrl project. #60

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
985f431
[WIP] Changes for monitoring support using tendrl project.
SaravanaStorageNetwork Nov 23, 2017
1ab4012
Set selinux config as permissive.
SaravanaStorageNetwork Nov 27, 2017
c9db13a
Pre-install tendrl-gluster-integration instead of waiting
SaravanaStorageNetwork Nov 29, 2017
29a0c7e
Group all yum install under single RUN.
SaravanaStorageNetwork Nov 30, 2017
6e67ae9
Combine multiple RUNs into one.
SaravanaStorageNetwork Dec 1, 2017
b30106a
combine COPY statements
SaravanaStorageNetwork Dec 2, 2017
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
14 changes: 13 additions & 1 deletion CentOS/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,18 @@ 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
Copy link

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.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

RUN yum --setopt=tsflags=nodocs -y install epel-release; \
yum --setopt=tsflags=nodocs -y install tendrl-node-agent tendrl-collectd-selinux tendrl-selinux; \
yum --setopt=tsflags=nodocs -y install tendrl-gluster-integration.noarch; \
yum clean all;

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
Copy link

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.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done


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 2379 2003

CMD ["/usr/sbin/init"]
10 changes: 10 additions & 0 deletions CentOS/tendrl/tendrl-dependencies-epel-7.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[tendrl-dependencies]
name=Copr repo for dependencies owned by tendrl
baseurl=https://copr-be.cloud.fedoraproject.org/results/tendrl/dependencies/epel-7-$basearch/
type=rpm-md
skip_if_unavailable=True
gpgcheck=1
gpgkey=https://copr-be.cloud.fedoraproject.org/results/tendrl/dependencies/pubkey.gpg
repo_gpgcheck=0
enabled=1
enabled_metadata=1
10 changes: 10 additions & 0 deletions CentOS/tendrl/tendrl-release-epel-7.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[tendrl-release]
name=Copr repo for release owned by tendrl
baseurl=https://copr-be.cloud.fedoraproject.org/results/tendrl/release/epel-7-$basearch/
type=rpm-md
skip_if_unavailable=True
gpgcheck=1
gpgkey=https://copr-be.cloud.fedoraproject.org/results/tendrl/release/pubkey.gpg
repo_gpgcheck=0
enabled=1
enabled_metadata=1