Skip to content

Commit

Permalink
CLEAN and ADD Note
Browse files Browse the repository at this point in the history
  • Loading branch information
Davi Mello committed Dec 9, 2021
1 parent 2853d59 commit 34df028
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions dev-tools/packaging/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -669,11 +669,13 @@ shared:
from: 'arm64v8/ubuntu:20.04'
buildFrom: 'arm64v8/ubuntu:20.04'

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

# TODO: Did I must change those to ?
- &docker_arm_ubi_spec
extra_vars:
image_name: '{{.BeatName}}-ubi8'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ ENV BEAT_SETUID_AS={{ .user }}
{{- if contains .from "ubi-minimal" }}
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)
{{- else }}
# Installing jq needs to be installed after epel-release and cannot be in the same yum install command.

RUN for iter in {1..10}; do \
apt update -y && \
apt install --no-install-recommends --yes jq && \
Expand Down

0 comments on commit 34df028

Please sign in to comment.