File tree Expand file tree Collapse file tree 2 files changed +6
-12
lines changed Expand file tree Collapse file tree 2 files changed +6
-12
lines changed Original file line number Diff line number Diff line change 1
- ARG base_image=alpine:3.11
1
+ ARG base_image=alpine:3.12
2
2
3
3
FROM $base_image AS core
4
4
@@ -27,7 +27,7 @@ ENV NRIA_IS_CONTAINERIZED true
27
27
ENV NRIA_OVERRIDE_HOST_ROOT /host
28
28
29
29
RUN apk add --no-cache --upgrade \
30
- ca-certificates \
30
+ ca-certificates=20191127-r4 \
31
31
# Embed required dlls:
32
32
# ldd /usr/bin/newrelic-infra
33
33
# /lib64/ld-linux-x86-64.so.2 (0x7f2bbbd0f000)
@@ -36,7 +36,7 @@ RUN apk add --no-cache --upgrade \
36
36
# As musl and glibc are compatible, this symlink fixes the missing dependency
37
37
&& mkdir /lib64 \
38
38
&& 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
40
40
41
41
# Tini is now available at /sbin/tini
42
42
ENTRYPOINT ["/sbin/tini" , "--" ]
@@ -54,7 +54,8 @@ ARG nri_flex_version
54
54
LABEL com.newrelic.nri-docker.version=$nri_docker_version \
55
55
com.newrelic.nri-flex.version=$nri_flex_version
56
56
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
59
60
60
61
COPY $nri_pkg_dir /
Original file line number Diff line number Diff line change @@ -84,13 +84,6 @@ build/base :
84
84
-f ${DOCKERFILE} \
85
85
${INFRASTRUCTURE_WORKSPACE} )
86
86
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
-
94
87
# publish to docker hub
95
88
.PHONY : publish/base
96
89
publish/base : build/base
You can’t perform that action at this time.
0 commit comments