Skip to content

Commit

Permalink
Corrected some Docker build warnings.
Browse files Browse the repository at this point in the history
Signed-off-by: Hermann Mayer <[email protected]>
  • Loading branch information
Jack12816 committed Oct 9, 2024
1 parent 90cfed1 commit 26dda7e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
4 changes: 2 additions & 2 deletions 7.10/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM elasticsearch:7.10.1
MAINTAINER Hermann Mayer "hermann.mayer@hausgold.de"
LABEL org.opencontainers.image.authors="containers@hausgold.de"

# You can change this environment variable on run's with -e
ENV MDNS_HOSTNAME=elasticsearch.local
Expand Down Expand Up @@ -33,4 +33,4 @@ COPY config/haproxy.conf /etc/haproxy/haproxy.cfg
COPY config/supervisor/* /etc/supervisord.d/

# Define the command to run per default
CMD /usr/bin/supervisord -nc /etc/supervisord.conf
CMD ["/usr/bin/supervisord", "-nc", "/etc/supervisord.conf"]
17 changes: 13 additions & 4 deletions 7.9/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM elasticsearch:7.9.3
MAINTAINER Hermann Mayer "hermann.mayer@hausgold.de"
LABEL org.opencontainers.image.authors="containers@hausgold.de"

# You can change this environment variable on run's with -e
ENV MDNS_HOSTNAME=elasticsearch.local
Expand All @@ -9,8 +9,17 @@ ENV ES_JAVA_OPTS='-Xms96m -Xmx96m'
ENV discovery.type='single-node'

# Install system packages
RUN yum install -y epel-release && \
yum install -y \
# while fixing EL7 repositories base URLs
# and installing the OKay EL repository
RUN \
sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && \
sed -i \
's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' \
/etc/yum.repos.d/CentOS-* && \
yum install -y epel-release && \
export OKAY_BASE='http://repo.okay.com.mx/centos/7/x86_64/release' && \
rpm -ivh "${OKAY_BASE}/okay-release-1-5.el7.noarch.rpm" && \
yum install -y --nogpgcheck \
dbus avahi avahi-tools nss-mdns haproxy supervisor

# Copy custom scripts
Expand All @@ -24,4 +33,4 @@ COPY config/haproxy.conf /etc/haproxy/haproxy.cfg
COPY config/supervisor/* /etc/supervisord.d/

# Define the command to run per default
CMD /usr/bin/supervisord -nc /etc/supervisord.conf
CMD ["/usr/bin/supervisord", "-nc", "/etc/supervisord.conf"]

0 comments on commit 26dda7e

Please sign in to comment.