Skip to content

Commit 5ec9930

Browse files
authored
Added back missing haproxy config to Dockerfile. (#16)
1 parent 0cf7b56 commit 5ec9930

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

Dockerfile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,32 @@
1515
#
1616
FROM --platform=$TARGETPLATFORM centos:7
1717

18-
#install HTTPD
18+
# Install HTTPD
1919
RUN yum -y update && yum -y install httpd mod_ssl procps haproxy iputils tree telnet && yum clean all
2020

21-
#remove default CentOS config
21+
# Remove default CentOS config
2222
RUN rm -rf /etc/httpd/conf/* && rm -rf /etc/httpd/conf.d/* && rm -rf /etc/httpd/conf.modules.d/*
2323

24-
#Copy the AMS base files into the image.
24+
# Copy the AMS base files into the image.
2525
COPY ams/2.6/etc/httpd /etc/httpd
2626
# Setup sample configs
2727
COPY sample/weretail_filters.any /etc/httpd/conf.dispatcher.d/filters/weretail_filters.any
2828
COPY sample/weretail_publish_farm.any /etc/httpd/conf.dispatcher.d/available_farms/100_weretail_publish_farm.any
2929

30+
# Copy haproxy config
31+
COPY haproxy/haproxy.cfg /etc/haproxy
32+
3033
# Install dispatcher
3134
ARG TARGETARCH
3235
COPY scripts/setup.sh /
3336
RUN chmod +x /setup.sh
34-
# ensuring correct file ending on windows systems
37+
# Ensuring correct file ending on windows systems
3538
RUN sed -i -e 's/\r\n/\n/' /setup.sh
3639
RUN ./setup.sh
3740
RUN rm /setup.sh
3841

39-
4042
COPY scripts/launch.sh /
41-
# ensuring correct file ending on windows systems
43+
# Ensuring correct file ending on windows systems
4244
RUN sed -i -e 's/\r\n/\n/' /launch.sh
4345
RUN chmod +x /launch.sh
4446

0 commit comments

Comments
 (0)