@@ -42,27 +42,26 @@ ENV BEAT_SETUID_AS={{ .user }}
4242{{- if contains .from "ubi-minimal" }}
4343RUN for iter in {1..10}; do microdnf update -y && microdnf install -y shadow-utils jq && microdnf clean all && exit_code=0 && break || exit_code=$? && echo "microdnf error: retry $iter in 10s" && sleep 10; done; (exit $exit_code)
4444{{- else }}
45- # Installing jq needs to be installed after epel-release and cannot be in the same yum install command.
46- RUN case $(arch) in aarch64) YUM_FLAGS="-x bind-license";; esac; \
47- for iter in {1..10}; do \
48- yum update -y $YUM_FLAGS && \
49- yum install -y epel-release && \
50- yum update -y $YUM_FLAGS && \
51- yum install -y jq && \
52- yum clean all && \
53- exit_code=0 && break || exit_code=$? && echo "yum error: retry $iter in 10s" && sleep 10; \
45+
46+ RUN for iter in {1..10}; do \
47+ apt-get update -y && \
48+ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --yes jq && \
49+ apt-get clean all && \
50+ exit_code=0 && break || exit_code=$? && echo "apt-get error: retry $iter in 10s" && sleep 10; \
5451 done; \
5552 (exit $exit_code)
5653{{- end }}
5754
5855{{- if (and (contains .image_name "-complete") (not (contains .from "ubi-minimal"))) }}
59- RUN for iter in {1..10}; do \
60- yum -y install atk gtk gdk xrandr pango libXcomposite libXcursor libXdamage \
61- libXext libXi libXtst libXScrnSaver libXrandr GConf2 \
62- alsa-lib atk gtk3 ipa-gothic-fonts xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-utils \
63- xorg-x11-fonts-cyrillic xorg-x11-fonts-Type1 xorg-x11-fonts-misc \
64- yum clean all && \
65- exit_code=0 && break || exit_code=$? && echo "yum error: retry $iter in 10s" && sleep 10; \
56+ RUN apt-get update -y && \
57+ for iter in {1..10}; do \
58+ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --yes \
59+ libatk1.0-0 libgdk-pixbuf2.0-dev x11-xserver-utils libpango-1.0-0 libxcomposite-dev libxcursor-dev \
60+ libxdamage-dev libxext-dev libxi-dev libxtst-dev libxss-dev libxrandr-dev gconf2 \
61+ libasound2 fonts-ipafont-gothic xfonts-100dpi xfonts-75dpi xfonts-cyrillic xfonts-scalable \
62+ xfonts-base x11-utils &&\
63+ apt-get clean all && \
64+ exit_code=0 && break || exit_code=$? && echo "apt-get error: retry $iter in 10s" && sleep 10; \
6665 done; \
6766 (exit $exit_code)
6867ENV NODE_PATH={{ $beatHome }}/.node
@@ -213,3 +212,4 @@ RUN echo -e '#!/bin/sh\nexec /usr/local/bin/docker-entrypoint' > /app/apm.sh &&
213212{{- else }}
214213ENTRYPOINT ["/usr/bin/tini", "--", "/usr/local/bin/docker-entrypoint"]
215214{{- end }}
215+
0 commit comments