diff --git a/bin/start-agent.sh b/bin/start-agent.sh index bb541695..a4a813b7 100755 --- a/bin/start-agent.sh +++ b/bin/start-agent.sh @@ -29,7 +29,7 @@ region = $AWS_REGION " > ./.aws/config docker build -t agent:latest . -docker run -p 25888:25888/udp -p 25888:25888/tcp \ +docker run -p 25888:25888/udp -p 25888:25888/tcp \ -e AWS_REGION=$AWS_REGION \ -e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID \ -e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY \ diff --git a/src/integration-test/resources/agent/Dockerfile b/src/integration-test/resources/agent/Dockerfile index e51138e1..93c55185 100644 --- a/src/integration-test/resources/agent/Dockerfile +++ b/src/integration-test/resources/agent/Dockerfile @@ -1,20 +1,8 @@ - -FROM public.ecr.aws/lts/ubuntu:latest - -RUN apt-get update && \ - apt-get install -y ca-certificates curl && \ - rm -rf /var/lib/apt/lists/* - -RUN curl -O https://amazon-cloud-watch-agent.s3.amazonaws.com/debian/amd64/1.237768.0/amazon-cloudwatch-agent.deb && \ - dpkg -i -E amazon-cloudwatch-agent.deb && \ - rm -rf /tmp/* && \ - rm -rf /opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-config-wizard && \ - rm -rf /opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl && \ - rm -rf /opt/aws/amazon-cloudwatch-agent/bin/config-downloader +FROM amazon/cloudwatch-agent COPY ./.aws/amazon-cloudwatch-agent.json /opt/aws/amazon-cloudwatch-agent/bin/default_linux_config.json COPY ./.aws/config /root/.aws/config COPY ./.aws/credentials /root/.aws/credentials ENV RUN_IN_CONTAINER="True" -ENTRYPOINT ["/opt/aws/amazon-cloudwatch-agent/bin/start-amazon-cloudwatch-agent"] \ No newline at end of file +ENTRYPOINT ["/opt/aws/amazon-cloudwatch-agent/bin/start-amazon-cloudwatch-agent"]