Skip to content

Commit 04335dd

Browse files
committed
chore: updated agent base image to Alpine 3.12
1 parent 266d63a commit 04335dd

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

build/container/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG base_image=alpine:3.11
1+
ARG base_image=alpine:3.12
22

33
FROM $base_image AS core
44

@@ -27,7 +27,7 @@ ENV NRIA_IS_CONTAINERIZED true
2727
ENV NRIA_OVERRIDE_HOST_ROOT /host
2828

2929
RUN apk add --no-cache --upgrade \
30-
ca-certificates \
30+
ca-certificates=20191127-r4 \
3131
# Embed required dlls:
3232
# ldd /usr/bin/newrelic-infra
3333
# /lib64/ld-linux-x86-64.so.2 (0x7f2bbbd0f000)
@@ -36,7 +36,7 @@ RUN apk add --no-cache --upgrade \
3636
# As musl and glibc are compatible, this symlink fixes the missing dependency
3737
&& mkdir /lib64 \
3838
&& ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2 \
39-
&& apk add --no-cache tini
39+
&& apk add --no-cache tini=0.19.0-r0
4040

4141
# Tini is now available at /sbin/tini
4242
ENTRYPOINT ["/sbin/tini", "--"]
@@ -54,7 +54,8 @@ ARG nri_flex_version
5454
LABEL com.newrelic.nri-docker.version=$nri_docker_version \
5555
com.newrelic.nri-flex.version=$nri_flex_version
5656

57-
RUN apk add --no-cache ntpsec=1.1.8-r0
58-
RUN apk add --no-cache curl=7.67.0-r0
57+
RUN apk add --no-cache \
58+
ntpsec=1.1.8-r0 \
59+
curl=7.69.1-r0
5960

6061
COPY $nri_pkg_dir /

build/container/Makefile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,6 @@ build/base :
8484
-f ${DOCKERFILE} \
8585
${INFRASTRUCTURE_WORKSPACE})
8686

87-
# publish to container fabric
88-
.PHONY : publish-cf/base
89-
publish-cf/base : build/base
90-
publish-cf/base :
91-
@(docker push cf-registry.nr-ops.net/infrastructure/newrelic-infrastructure:${IMAGE_VERSION})
92-
@(docker push cf-registry.nr-ops.net/infrastructure/newrelic-infrastructure:latest)
93-
9487
# publish to docker hub
9588
.PHONY : publish/base
9689
publish/base : build/base

0 commit comments

Comments
 (0)