DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #8396 from dmathieu/mkdir-modules-mount

Browse source 
Fix OpenTelemetry build
This commit is contained in:
James Strong 2022-03-31 19:55:53 -04:00 committed by GitHub
commit 7517b7ecf7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
images/opentelemetry/rootfs/Dockerfile
View file

@ -13,7 +13,7 @@
# limitations under the License.
FROM alpine:3.15.0 as builder
FROM alpine:3.14.4 as builder
COPY . /

10
images/opentelemetry/rootfs/build.sh
View file

@ -20,11 +20,11 @@ set -o pipefail
export NGINX_VERSION=1.19.10
# Check for recent changes: https://github.com/open-telemetry/opentelemetry-cpp/compare/v1.0.0...main
export OPENTELEMETRY_CPP_VERSION=1.0.0
# Check for recent changes: https://github.com/open-telemetry/opentelemetry-cpp/compare/v1.2.0...main
export OPENTELEMETRY_CPP_VERSION=1.2.0
# Check for recent changes: https://github.com/open-telemetry/opentelemetry-cpp-contrib/compare/f4850...main
export OPENTELEMETRY_CONTRIB_COMMIT=f48500884b1b32efc456790bbcdc2e6cf7a8e630
# Check for recent changes: https://github.com/open-telemetry/opentelemetry-cpp-contrib/compare/2656a4...main
export OPENTELEMETRY_CONTRIB_COMMIT=2656a4072e257b6794da86ddd1b773b49f5517b3
export BUILD_PATH=/tmp/build
@ -63,7 +63,7 @@ get_src()
get_src e8d0290ff561986ad7cd6c33307e12e11b137186c4403a6a5ccdb4914c082d88 \
"https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz"
get_src 45c52498788e47131b20a4786dbb08f4390b8cb419bd3d61c88b503cafff3324 \
get_src 360cdcbd1a235ec62119cc53956b2d31b6ff5f41d44415be53acc544709d58b8 \
"https://github.com/open-telemetry/opentelemetry-cpp-contrib/archive/$OPENTELEMETRY_CONTRIB_COMMIT.tar.gz"
# improve compilation times

1
images/opentelemetry/rootfs/init_module.sh
View file

@ -18,4 +18,5 @@ set -o errexit
set -o nounset
set -o pipefail
mkdir -p /modules_mount/etc/nginx/modules
cp -R /etc/nginx/modules /modules_mount/etc/nginx/modules