From 84b4cea96755e64a024f998fa836f18574f30e7a Mon Sep 17 00:00:00 2001 From: Andrew Cholakian Date: Sun, 15 Aug 2021 17:16:26 -0500 Subject: [PATCH] [elastic-agent] Rename 'offline' image to 'complete' (#27350) --- dev-tools/packaging/packages.yml | 8 ++++---- .../templates/docker/Dockerfile.elastic-agent.tmpl | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev-tools/packaging/packages.yml b/dev-tools/packaging/packages.yml index 8439ac68378..e3f45990424 100644 --- a/dev-tools/packaging/packages.yml +++ b/dev-tools/packaging/packages.yml @@ -1000,9 +1000,9 @@ specs: <<: *agent_docker_spec <<: *elastic_docker_spec <<: *elastic_license_for_binaries - # This image gets an 'offline' variant for synthetics and other large + # This image gets a 'complete' variant for synthetics and other large # packages too big to fit in the main image - variants: ["offline"] + variants: ["complete"] files: '{{.BeatName}}{{.BinaryExt}}': source: ./build/golang-crossbuild/{{.BeatName}}-{{.GOOS}}-{{.Platform.Arch}}{{.BinaryExt}} @@ -1026,9 +1026,9 @@ specs: <<: *agent_docker_arm_spec <<: *elastic_docker_spec <<: *elastic_license_for_binaries - # This image gets an 'offline' variant for synthetics and other large + # This image gets a 'complete' variant for synthetics and other large # packages too big to fit in the main image - variants: ["offline"] + variants: ["complete"] files: '{{.BeatName}}{{.BinaryExt}}': source: ./build/golang-crossbuild/{{.BeatName}}-{{.GOOS}}-{{.Platform.Arch}}{{.BinaryExt}} diff --git a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl index bbd98de33b7..8f38ae5d68d 100644 --- a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl +++ b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl @@ -28,7 +28,7 @@ RUN mkdir -p {{ $beatHome }}/data {{ $beatHome }}/data/elastic-agent-{{ commit_s FROM {{ .from }} # Contains the elastic agent image variant, an empty string for the standard variant -# or "offline" for the offline one. +# or "complete" for the bigger one. ENV ELASTIC_AGENT_IMAGE_VARIANT={{.Variant}} {{- if contains .from "ubi-minimal" }} @@ -48,7 +48,7 @@ RUN case $(arch) in aarch64) YUM_FLAGS="-x bind-license";; esac; \ (exit $exit_code) {{- end }} -{{- if (and (eq .Variant "offline") (not (contains .from "ubi-minimal"))) }} +{{- if (and (eq .Variant "complete") (not (contains .from "ubi-minimal"))) }} RUN for iter in {1..10}; do \ yum -y install atk cups gtk gdk xrandr pango libXcomposite libXcursor libXdamage \ libXext libXi libXtst cups-libs libXScrnSaver libXrandr GConf2 \ @@ -137,13 +137,13 @@ COPY --from=home {{ $beatHome }}/NOTICE.txt /licenses {{- if ne .user "root" }} RUN groupadd --gid 1000 {{ .BeatName }} RUN useradd -M --uid 1000 --gid 1000 --groups 0 --home {{ $beatHome }} {{ .user }} -{{- if (and (eq .Variant "offline") (not (contains .from "ubi-minimal"))) }} +{{- if (and (eq .Variant "complete") (not (contains .from "ubi-minimal"))) }} RUN chown {{ .user }} $NODE_PATH {{- end }} {{- end }} USER {{ .user }} -{{- if (and (eq .Variant "offline") (not (contains .from "ubi-minimal"))) }} +{{- if (and (eq .Variant "complete") (not (contains .from "ubi-minimal"))) }} # Setup synthetics env vars ENV ELASTIC_SYNTHETICS_CAPABLE=true ENV SUITES_DIR={{ $beatHome }}/suites