diff options
| author |   Andreas Seelinger <Andreas.Seelinger@accenture.com> | 2024-10-29 13:34:07 +0100 |
|---|---|---|
| committer | Andreas Seelinger <andreas.seelinger@accenture.com> | 2024-11-05 11:34:05 +0100 |
| commit | 26092e3d55ec4d7be061fbedce43d7b27439af01 (patch) | |
| tree | f2115541fe8bb7ad34db73656146ca647b840350 /aai-common-docker/aai-haproxy-image/src/main/docker/Dockerfile | |
| parent | 3fbefc8f671e10cec549019123555c4c5f07b51f (diff) | |
Kyverno fixes for AAI
- Change entrypoint of aai-haproxy to remove the need to modify
resolvers.conf
- Need an updated version of the aai-helmcharts. Since resolvers.conf is
a config map now
Issue-ID: AAI-4043
Change-Id: I97092b293ec6c27dd23215918b5368de7570ad4b
Signed-off-by: Andreas Seelinger <Andreas.Seelinger@accenture.com>
Diffstat (limited to 'aai-common-docker/aai-haproxy-image/src/main/docker/Dockerfile')
| -rw-r--r-- | aai-common-docker/aai-haproxy-image/src/main/docker/Dockerfile | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/aai-common-docker/aai-haproxy-image/src/main/docker/Dockerfile b/aai-common-docker/aai-haproxy-image/src/main/docker/Dockerfile index 1508abca..3057d141 100644 --- a/aai-common-docker/aai-haproxy-image/src/main/docker/Dockerfile +++ b/aai-common-docker/aai-haproxy-image/src/main/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM haproxy:2.4.13-alpine +FROM haproxy:2.4.27-alpine # For building the image in a proxy environment if necessary ARG HTTP_PROXY @@ -25,21 +25,18 @@ RUN apk add --no-cache \ RUN mkdir -p /etc/ssl/certs/ && mkdir -p /etc/ssl/private COPY --chown=haproxy aai.pem /etc/ssl/private/aai.pem -COPY --chown=haproxy docker-entrypoint.sh /docker-entrypoint.sh -COPY --chown=haproxy resolvers.conf /usr/local/etc/haproxy/resolvers.conf COPY --chown=haproxy haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg # Changing group and group permission to allow haproxy user to execute sed comamnd ot change files RUN chgrp haproxy /usr/local/etc/haproxy; \ - chgrp haproxy /docker-entrypoint.sh /usr/local/etc/haproxy/haproxy.cfg /usr/local/etc/haproxy/resolvers.conf + chgrp haproxy /usr/local/etc/haproxy/haproxy.cfg -RUN chmod +x /docker-entrypoint.sh; \ - chmod g+wx /usr/local/etc/haproxy; \ - chmod g+w /docker-entrypoint.sh /usr/local/etc/haproxy/haproxy.cfg /usr/local/etc/haproxy/resolvers.conf +RUN chmod g+wx /usr/local/etc/haproxy; \ + chmod g+w /usr/local/etc/haproxy/haproxy.cfg # Reverting to haproxy use to not run the pod with root permissions USER haproxy -ENTRYPOINT [ "/docker-entrypoint.sh" ] -CMD [ "haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg", "-f", "/usr/local/etc/haproxy/resolvers.conf" ] +ENTRYPOINT [ "haproxy" ] +CMD [ "-W", "-db", "-f", "/usr/local/etc/haproxy/haproxy.cfg", "-f", "/usr/local/etc/haproxy/resolvers.conf" ] EXPOSE 8443 |