Skip to content

Commit 2b61b70

Browse files
committed
Switch to Ubuntu 20.04.
1 parent fc7b8fc commit 2b61b70

File tree

11 files changed

+35
-33
lines changed

11 files changed

+35
-33
lines changed

.ci/packer_cache.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function dockerPullCommonImages() {
2121
docker.elastic.co/observability-ci/database-enterprise:12.2.0.1
2222
docker.elastic.co/beats-dev/fpm:1.11.0
2323
golang:1.14.12-stretch
24-
centos:7
24+
ubuntu:20.04
2525
"
2626
for image in ${DOCKER_IMAGES} ; do
2727
(retry 2 docker pull ${image}) || echo "Error pulling ${image} Docker image. Continuing."

auditbeat/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM golang:1.17.5
22

33
RUN \
44
apt-get update \
5-
&& apt-get install -y --no-install-recommends \
5+
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
66
python3 \
77
python3-pip \
88
python3-venv \

dev-tools/packaging/packages.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -475,8 +475,8 @@ shared:
475475
- &agent_docker_spec
476476
<<: *agent_binary_spec
477477
extra_vars:
478-
from: 'centos:7'
479-
buildFrom: 'centos:7'
478+
from: 'ubuntu:20.04'
479+
buildFrom: 'ubuntu:20.04'
480480
dockerfile: 'Dockerfile.elastic-agent.tmpl'
481481
docker_entrypoint: 'docker-entrypoint.elastic-agent.tmpl'
482482
user: '{{ .BeatName }}'
@@ -495,8 +495,8 @@ shared:
495495
- &agent_docker_arm_spec
496496
<<: *agent_docker_spec
497497
extra_vars:
498-
from: 'arm64v8/centos:7'
499-
buildFrom: 'arm64v8/centos:7'
498+
from: 'arm64v8/ubuntu:20.04'
499+
buildFrom: 'arm64v8/ubuntu:20.04'
500500

501501
- &agent_docker_cloud_spec
502502
<<: *agent_docker_spec
@@ -653,8 +653,8 @@ shared:
653653
- &docker_spec
654654
<<: *binary_spec
655655
extra_vars:
656-
from: 'centos:7'
657-
buildFrom: 'centos:7'
656+
from: 'ubuntu:20.04'
657+
buildFrom: 'ubuntu:20.04'
658658
user: '{{ .BeatName }}'
659659
linux_capabilities: ''
660660
files:
@@ -666,14 +666,16 @@ shared:
666666
- &docker_arm_spec
667667
<<: *docker_spec
668668
extra_vars:
669-
from: 'arm64v8/centos:7'
670-
buildFrom: 'arm64v8/centos:7'
669+
from: 'arm64v8/ubuntu:20.04'
670+
buildFrom: 'arm64v8/ubuntu:20.04'
671671

672+
# TODO: Did I must change those to ?
672673
- &docker_ubi_spec
673674
extra_vars:
674675
image_name: '{{.BeatName}}-ubi8'
675676
from: 'docker.elastic.co/ubi8/ubi-minimal'
676677

678+
# TODO: Did I must change those to ?
677679
- &docker_arm_ubi_spec
678680
extra_vars:
679681
image_name: '{{.BeatName}}-ubi8'

dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,27 +42,26 @@ ENV BEAT_SETUID_AS={{ .user }}
4242
{{- if contains .from "ubi-minimal" }}
4343
RUN 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)
6867
ENV NODE_PATH={{ $beatHome }}/.node
@@ -213,3 +212,4 @@ RUN echo -e '#!/bin/sh\nexec /usr/local/bin/docker-entrypoint' > /app/apm.sh &&
213212
{{- else }}
214213
ENTRYPOINT ["/usr/bin/tini", "--", "/usr/local/bin/docker-entrypoint"]
215214
{{- end }}
215+

filebeat/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM golang:1.17.5
22

33
RUN \
44
apt-get update \
5-
&& apt-get install -y --no-install-recommends \
5+
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
66
libsystemd-dev \
77
netcat \
88
rsync \

heartbeat/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM golang:1.17.5
22

33
RUN \
44
apt-get update \
5-
&& apt-get install -y --no-install-recommends \
5+
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
66
netcat \
77
python3 \
88
python3-pip \

libbeat/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM golang:1.17.5
22

33
RUN \
44
apt-get update \
5-
&& apt-get install -y --no-install-recommends \
5+
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
66
netcat \
77
libpcap-dev \
88
python3 \

metricbeat/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM golang:1.17.5
22

33
RUN \
44
apt update \
5-
&& apt install -qq -y --no-install-recommends \
5+
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends \
66
netcat \
77
python3 \
88
python3-dev \

packetbeat/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM golang:1.17.5
22

33
RUN \
44
apt-get update \
5-
&& apt-get install -y --no-install-recommends \
5+
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
66
python3 \
77
python3-pip \
88
python3-venv \

x-pack/functionbeat/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM golang:1.17.5
22

33
RUN \
44
apt-get update \
5-
&& apt-get install -y --no-install-recommends \
5+
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
66
netcat \
77
rsync \
88
python3 \

0 commit comments

Comments
 (0)