Skip to content

Commit

Permalink
Merge branch 'main' into chore/go-cve
Browse files Browse the repository at this point in the history
  • Loading branch information
jjngx committed Jul 22, 2022
2 parents 5f12018 + dd1b3c1 commit 9873cd5
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions build/Dockerfile
Expand Up @@ -6,12 +6,12 @@ ARG DEBIAN_VERSION=bullseye-slim


############################################# Base images containing libs for Opentracing #############################################
FROM opentracing/nginx-opentracing:nginx-1.23.0 as opentracing-lib
FROM opentracing/nginx-opentracing:nginx-1.23.0-alpine as alpine-opentracing-lib
FROM opentracing/nginx-opentracing:nginx-1.23.1 as opentracing-lib
FROM opentracing/nginx-opentracing:nginx-1.23.1-alpine as alpine-opentracing-lib


############################################# Base image for Debian #############################################
FROM nginx:1.23.0 AS debian
FROM nginx:1.23.1 AS debian

RUN --mount=type=bind,from=opentracing-lib,target=/tmp/ot/ \
apt-get update \
Expand All @@ -27,7 +27,7 @@ RUN --mount=type=bind,from=opentracing-lib,target=/tmp/ot/ \

############################################# Base image for Alpine #############################################
# docker.io/library/nginx is a temporary workaround for Dependabot to see this as different from the one used in Debian
FROM docker.io/library/nginx:1.23.0-alpine AS alpine
FROM docker.io/library/nginx:1.23.1-alpine AS alpine

RUN --mount=type=bind,from=alpine-opentracing-lib,target=/tmp/ot/ \
apk add --no-cache libcap libstdc++ \
Expand Down

0 comments on commit 9873cd5

Please sign in to comment.