Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f03e3089ab | ||
|
|
8690d5216b
|
||
|
|
307ef59355
|
||
|
|
812142a1b1
|
@@ -25,7 +25,6 @@ jobs:
|
||||
platforms: |
|
||||
linux/amd64
|
||||
linux/arm64
|
||||
linux/arm/v7
|
||||
push: true
|
||||
pull: true
|
||||
ssh: default=/var/lib/gitea-runner/.ssh/id_ed25519
|
||||
@@ -48,7 +47,6 @@ jobs:
|
||||
platforms: |
|
||||
linux/amd64
|
||||
linux/arm64
|
||||
linux/arm/v7
|
||||
push: true
|
||||
pull: true
|
||||
ssh: default=/var/lib/gitea-runner/.ssh/id_ed25519
|
||||
|
||||
+2
-1
@@ -27,12 +27,12 @@ RUN --mount=type=cache,target=/var/cache/apk apk add \
|
||||
libxslt-dev \
|
||||
linux-headers \
|
||||
make \
|
||||
musl-dev \
|
||||
ninja \
|
||||
pcre \
|
||||
pcre-dev \
|
||||
perl-dev \
|
||||
quickjs-dev \
|
||||
re2-dev \
|
||||
su-exec \
|
||||
tar \
|
||||
tzdata \
|
||||
@@ -93,6 +93,7 @@ USER luser
|
||||
RUN cmake -G Ninja -B /home/luser/otel-build -S /nginx-otel \
|
||||
-DNGX_OTEL_NGINX_BUILD_DIR=/nginx/objs \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_CXX_FLAGS="-isystem /home/luser/otel-build/_deps/grpc-src/third_party/protobuf/third_party/utf8_range" \
|
||||
-DOPENSSL_ROOT_DIR=/home/luser/.local \
|
||||
-DNGX_OTEL_SDK=6f65c3eded2bb4656c8d675cad43bbe694c531c7 \
|
||||
-DNGX_OTEL_GRPC=c876f4da50f7da2f331888b88b2a7243514139fe \
|
||||
|
||||
+1
-1
@@ -58,5 +58,5 @@ cd /nginx
|
||||
|
||||
auto/configure $CONFIG \
|
||||
--with-cc-opt="-I/home/luser/libressl/build/include" \
|
||||
--with-ld-opt="-lstdc++ -L/home/luser/libressl/build/ssl -L/home/luser/libressl/build/crypto"
|
||||
--with-ld-opt="-lstdc++ -L/home/luser/.local/lib"
|
||||
make -j$(nproc)
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ strip -s /usr/lib/nginx/modules/*.so
|
||||
|
||||
apk add --no-cache --virtual .gettext gettext
|
||||
mv /usr/bin/envsubst /tmp/
|
||||
runDeps="libintl libxml2 musl zlib tzdata ca-certificates pcre brotli-libs libxslt geoip libstdc++ c-ares libprotobuf re2"
|
||||
runDeps="libintl libxml2 musl zlib tzdata ca-certificates pcre brotli-libs libxslt geoip libstdc++ c-ares"
|
||||
apk add --no-cache $runDeps
|
||||
apk del .gettext
|
||||
mv /tmp/envsubst /usr/local/bin/
|
||||
|
||||
Reference in New Issue
Block a user