Skip to content

Commit

Permalink
Working OpenTelemetry sidecar (base nginx image) (kubernetes#8719)
Browse files Browse the repository at this point in the history
* Delete entrypoint script and add sidecar lib path

* make otel libs path otel specific

* add description

* remove library path adaption from nginx base image
  • Loading branch information
Tobrek authored and rchshld committed May 17, 2023
1 parent 4df91dd commit 0a7a4b1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 32 deletions.
6 changes: 1 addition & 5 deletions images/nginx/rootfs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,8 @@ ENV LUA_CPATH="/usr/local/lib/lua/?/?.so;/usr/local/lib/lua/?.so;;"
COPY --from=builder /usr/local /usr/local
COPY --from=builder /opt /opt
COPY --from=builder /etc/nginx /etc/nginx
COPY --from=builder entrypoint.sh /usr/local/entrypoint.sh

RUN chmod +x /usr/local/entrypoint.sh \
&& apk update \
RUN apk update \
&& apk upgrade \
&& apk add -U --no-cache \
bash \
Expand Down Expand Up @@ -73,6 +71,4 @@ RUN chmod +x /usr/local/entrypoint.sh \

EXPOSE 80 443

ENTRYPOINT ["/usr/local/entrypoint.sh"]

CMD ["nginx", "-g", "daemon off;"]
27 changes: 0 additions & 27 deletions images/nginx/rootfs/entrypoint.sh

This file was deleted.

0 comments on commit 0a7a4b1

Please sign in to comment.