Move yum install of epel-release and jq to the docker file and not so…

…mething that is done on first start of the docker container. (elastic#18358)
eric4545 · May 7, 2020 · cbbca88 · cbbca88
1 parent 0a327bb
commit cbbca88
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl
@@ -5,6 +5,7 @@
 FROM {{ .from }}
 
 RUN yum -y --setopt=tsflags=nodocs update && \
+    yum install -y epel-release jq \
     yum clean all
 
 LABEL \

diff --git a/dev-tools/packaging/templates/docker/docker-entrypoint.elastic-agent.tmpl b/dev-tools/packaging/templates/docker/docker-entrypoint.elastic-agent.tmpl
@@ -46,8 +46,6 @@ function enroll(){
 
     ./{{ .BeatName }} enroll ${KIBANA_HOST:-http://localhost:5601} $apikey -f
 }
-yum install -y epel-release
-yum install -y jq
 
 if [[ -n "${FLEET_SETUP}" ]] && [[ ${FLEET_SETUP} == 1 ]]; then setup; fi
 if [[ -n "${FLEET_ENROLL}" ]] && [[ ${FLEET_ENROLL} == 1 ]]; then enroll; fi