8000 Add tracking.info and copy into plus images · nginx/kubernetes-ingress@bdb1e83 · GitHub
[go: up one dir, main page]
Skip to content

Commit bdb1e83

Browse files
javorszkyjavorszky
committed
Add tracking.info and copy into plus images
Closes #7360 * adds a `dependencies/tracking.info.default` file that is mounted into the docker images that include nginx plus * file contains attribution to nic * dockerfile also has comments explaining the inclusion This is potentially a stopgap solution until we have time to look at startup order.
1 parent b7e6252 commit bdb1e83

File tree

2 files changed

+61
-0
lines changed

2 files changed

+61
-0
lines changed

‎build/Dockerfile‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,11 @@ ARG PACKAGE_REPO
108108

109109
ENV NGINX_VERSION=${NGINX_PLUS_VERSION}
110110

111+
# Startup is non-deterministic between NGINX Plus reporting usage and licence reporter initialising. This
112+
# is a workaround to attribute the installation to nic even if licence reporter isn't ready yet.
113+
# @See https://github.com/nginx/kubernetes-ingress/issues/7360
114+
COPY dependencies/tracking.info.default /etc/nginx/reporting/tracking.info
115+
111116
RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/apk/cert.pem,mode=0644 \
112117
--mount=type=secret,id=nginx-repo.key,dst=/etc/apk/cert.key,mode=0644 \
113118
--mount=type=bind,from=alpine-opentracing-lib,target=/tmp/ot/ \
@@ -127,6 +132,11 @@ ARG NGINX_PLUS_VERSION
127132

128133
ENV NGINX_VERSION=${NGINX_PLUS_VERSION}
129134

135+
# Startup is non-deterministic between NGINX Plus reporting usage and licence reporter initialising. This
136+
# is a workaround to attribute the installation to nic even if licence reporter isn't ready yet.
137+
# @See https://github.com/nginx/kubernetes-ingress/issues/7360
138+
COPY dependencies/tracking.info.default /etc/nginx/reporting/tracking.info
139+
130140
RUN --mount=type=bind,from=alpine-fips-3.20,target=/tmp/fips/ \
131141
mkdir -p /usr/ssl \
132142
&& cp -av /tmp/fips/usr/lib/ossl-modules/fips.so /usr/lib/ossl-modules/fips.so \
@@ -143,6 +153,11 @@ ARG PACKAGE_REPO
143153

144154
ENV NGINX_VERSION=${NGINX_PLUS_VERSION}
145155

156+
# Startup is non-deterministic between NGINX Plus reporting usage and licence reporter initialising. This
157+
# is a workaround to attribute the installation to nic even if licence reporter isn't ready yet.
158+
# @See https://github.com/nginx/kubernetes-ingress/issues/7360
159+
COPY dependencies/tracking.info.default /etc/nginx/reporting/tracking.info
160+
146161
RUN --mount=type=bind,from=alpine-fips-3.17,target=/tmp/fips/ \
147162
--mount=type=secret,id=nginx-repo.crt,dst=/etc/apk/cert.pem,mode=0644 \
148163
--mount=type=secret,id=nginx-repo.key,dst=/etc/apk/cert.key,mode=0644 \
@@ -180,6 +195,11 @@ ARG PACKAGE_REPO
180195

181196
ENV NGINX_VERSION=${NGINX_PLUS_VERSION}
182197

198+
# Startup is non-deterministic between NGINX Plus reporting usage and licence reporter initialising. This
199+
# is a workaround to attribute the installation to nic even if licence reporter isn't ready yet.
200+
# @See https://github.com/nginx/kubernetes-ingress/issues/7360
201+
COPY dependencies/tracking.info.default /etc/nginx/reporting/tracking.info
202+
183203
RUN --mount=type=bind,from=alpine-fips-3.17,target=/tmp/fips/ \
184204
--mount=type=secret,id=nginx-repo.crt,dst=/etc/apk/cert.pem,mode=0644 \
185205
--mount=type=secret,id=nginx-repo.key,dst=/etc/apk/cert.key,mode=0644 \
@@ -212,6 +232,11 @@ ARG NGINX_PLUS_VERSION
212232

213233
ENV NGINX_VERSION=${NGINX_PLUS_VERSION}
214234

235+
# Startup is non-deterministic between NGINX Plus reporting usage and licence reporter initialising. This
236+
# is a workaround to attribute the installation to nic even if licence reporter isn't ready yet.
237+
# @See https://github.com/nginx/kubernetes-ingress/issues/7360
238+
COPY dependencies/tracking.info.default /etc/nginx/reporting/tracking.info
239+
215240
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
216241
RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644 \
217242
--mount=type=secret,id=nginx-repo.key,dst=/etc/ssl/nginx/nginx-repo.key,mode=0644 \
@@ -243,6 +268,11 @@ ARG NGINX_PLUS_VERSION
243268

244269
ENV NGINX_VERSION=${NGINX_PLUS_VERSION}
245270

271+
# Startup is non-deterministic between NGINX Plus reporting usage and licence reporter initialising. This
272+
# is a workaround to attribute the installation to nic even if licence reporter isn't ready yet.
273+
# @See https://github.com/nginx/kubernetes-ingress/issues/7360
274+
COPY dependencies/tracking.info.default /etc/nginx/reporting/tracking.info
275+
246276
RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644 \
247277
--mount=type=secret,id=nginx-repo.key,dst=/etc/ssl/nginx/nginx-repo.key,mode=0644 \
248278
--mount=type=bind,from=opentracing-lib,target=/tmp/ot/ \
@@ -287,6 +317,11 @@ ARG NGINX_PLUS_VERSION
287317

288318
ENV NGINX_VERSION=${NGINX_PLUS_VERSION}
289319

320+
# Startup is non-deterministic between NGINX Plus reporting usage and licence reporter initialising. This
321+
# is a workaround to attribute the installation to nic even if licence reporter isn't ready yet.
322+
# @See https://github.com/nginx/kubernetes-ingress/issues/7360
323+
COPY dependencies/tracking.info.default /etc/nginx/reporting/tracking.info
324+
290325
RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644 \
291326
--mount=type=secret,id=nginx-repo.key,dst=/etc/ssl/nginx/nginx-repo.key,mode=0644 \
292327
--mount=type=bind,from=nginx-files,src=90pkgs-nginx,target=/etc/apt/apt.conf.d/90pkgs-nginx \
@@ -356,6 +391,11 @@ ARG NGINX_PLUS_VERSION
356391

357392
ENV NGINX_VERSION=${NGINX_PLUS_VERSION}
358393

394+
# Startup is non-deterministic between NGINX Plus reporting usage and licence reporter initialising. This
395+
# is a workaround to attribute the installation to nic even if licence reporter isn't ready yet.
396+
# @See https://github.com/nginx/kubernetes-ingress/issues/7360
397+
COPY dependencies/tracking.info.default /etc/nginx/reporting/tracking.info
398+
359399
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
360400
RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644 \
361401
--mount=type=secret,id=nginx-repo.key,dst=/etc/ssl/nginx/nginx-repo.key,mode=0644 \
@@ -373,6 +413,11 @@ FROM ubi-9-plus AS ubi-9-plus-nap
373413
ARG NAP_MODULES
374414
ARG NGINX_AGENT
375415

416+
# Startup is non-deterministic between NGINX Plus reporting usage and licence reporter initialising. This
417+
# is a workaround to attribute the installation to nic even if licence reporter isn't ready yet.
418+
# @See https://github.com/nginx/kubernetes-ingress/issues/7360
419+
COPY dependencies/tracking.info.default /etc/nginx/reporting/tracking.info
420+
376421
RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644 \
377422
--mount=type=secret,id=nginx-repo.key,dst=/etc/ssl/nginx/nginx-repo.key,mode=0644 \
378423
--mount=type=secret,id=rhel_license,dst=/tmp/rhel_license,mode=0644 \
@@ -415,6 +460,11 @@ FROM ubi-9-plus AS ubi-9-plus-nap-v5
415460
ARG NAP_MODULES
416461
ARG NGINX_AGENT
417462

463+
# Startup is non-deterministic between NGINX Plus reporting usage and licence reporter initialising. This
464+
# is a workaround to attribute the installation to nic even if licence reporter isn't ready yet.
465+
# @See https://github.com/nginx/kubernetes-ingress/issues/7360
466+
COPY dependencies/tracking.info.default /etc/nginx/reporting/tracking.info
467+
418468
RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644 \
419469
--mount=type=secret,id=nginx-repo.key,dst=/etc/ssl/nginx/nginx-repo.key,mode=0644 \
420470
--mount=type=secret,id=rhel_license,dst=/tmp/rhel_license,mode=0644 \
@@ -446,6 +496,11 @@ ARG NGINX_PLUS_VERSION
446496

447497
ENV NGINX_VERSION=${NGINX_PLUS_VERSION}
448498

499+
# Startup is non-deterministic between NGINX Plus reporting usage and licence reporter initialising. This
500+
# is a workaround to attribute the installation to nic even if licence reporter isn't ready yet.
501+
# @See https://github.com/nginx/kubernetes-ingress/issues/7360
502+
COPY dependencies/tracking.info.default /etc/nginx/reporting/tracking.info
503+
449504
RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644 \
450505
--mount=type=secret,id=nginx-repo.key,dst=/etc/ssl/nginx/nginx-repo.key,mode=0644 \
451506
--mount=type=secret,id=rhel_license,dst=/tmp/rhel_license,mode=0644 \
@@ -491,6 +546,11 @@ ARG NGINX_PLUS_VERSION
491546

492547
ENV NGINX_VERSION=${NGINX_PLUS_VERSION}
493548

549+
# Startup is non-deterministic between NGINX Plus reporting usage and licence reporter initialising. This
550+
# is a workaround to attribute the installation to nic even if licence reporter isn't ready yet.
551+
# @See https://github.com/nginx/kubernetes-ingress/issues/7360
552+
COPY dependencies/tracking.info.default /etc/nginx/reporting/tracking.info
553+
494554
RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644 \
495555
--mount=type=secret,id=nginx-repo.key,dst=/etc/ssl/nginx/nginx-repo.key,mode=0644 \
496556
--mount=type=secret,id=rhel_license,dst=/tmp/rhel_license,mode=0644 \

‎build/dependencies/tracking.info.default‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"integration": "nic"}

0 commit comments

Comments
 (0)
0