woggioni/docker-images
1
0
Fork 0
Code Actions Packages Releases Activity

Compare commits

base: woggioni/docker-images:master
Branches Tags
woggioni/docker-images:master woggioni/docker-images:tmp woggioni/docker-images:dev
..
compare: woggioni/docker-images:tmp
Branches Tags
woggioni/docker-images:master woggioni/docker-images:tmp woggioni/docker-images:dev
2 Commits
master .. tmp
Author SHA1 Message Date
woggioni b3c240b840 tmp 2026-08-06 08:15:40 +08:00
woggioni 8469bfb350 added otel module to nginx
CI / Build nginx docker images (push) Failing after 6m6s
Details
2026-08-06 02:12:45 +08:00
4 changed files with 5 additions and 4 deletions
Expand all files Collapse all files
.gitea/workflows/build-nginx.yaml
+2
View File
@@ -25,6 +25,7 @@ jobs:
platforms: | platforms: |
linux/amd64 linux/amd64
linux/arm64 linux/arm64
linux/arm/v7
push: true push: true
pull: true pull: true
ssh: default=/var/lib/gitea-runner/.ssh/id_ed25519 ssh: default=/var/lib/gitea-runner/.ssh/id_ed25519
@@ -47,6 +48,7 @@ jobs:
platforms: | platforms: |
linux/amd64 linux/amd64
linux/arm64 linux/arm64
linux/arm/v7
push: true push: true
pull: true pull: true
ssh: default=/var/lib/gitea-runner/.ssh/id_ed25519 ssh: default=/var/lib/gitea-runner/.ssh/id_ed25519
nginx/Dockerfile
+1 -2
View File
@@ -27,12 +27,12 @@ RUN --mount=type=cache,target=/var/cache/apk apk add \
libxslt-dev \ libxslt-dev \
linux-headers \ linux-headers \
make \ make \
musl-dev \
ninja \ ninja \
pcre \ pcre \
pcre-dev \ pcre-dev \
perl-dev \ perl-dev \
quickjs-dev \ quickjs-dev \
re2-dev \
su-exec \ su-exec \
tar \ tar \
tzdata \ tzdata \
@@ -93,7 +93,6 @@ USER luser
RUN cmake -G Ninja -B /home/luser/otel-build -S /nginx-otel \ RUN cmake -G Ninja -B /home/luser/otel-build -S /nginx-otel \
-DNGX_OTEL_NGINX_BUILD_DIR=/nginx/objs \ -DNGX_OTEL_NGINX_BUILD_DIR=/nginx/objs \
-DCMAKE_BUILD_TYPE=Release \ -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 \ -DOPENSSL_ROOT_DIR=/home/luser/.local \
-DNGX_OTEL_SDK=6f65c3eded2bb4656c8d675cad43bbe694c531c7 \ -DNGX_OTEL_SDK=6f65c3eded2bb4656c8d675cad43bbe694c531c7 \
-DNGX_OTEL_GRPC=c876f4da50f7da2f331888b88b2a7243514139fe \ -DNGX_OTEL_GRPC=c876f4da50f7da2f331888b88b2a7243514139fe \
nginx/build.sh
+1 -1
View File
@@ -58,5 +58,5 @@ cd /nginx
auto/configure $CONFIG \ auto/configure $CONFIG \
--with-cc-opt="-I/home/luser/libressl/build/include" \ --with-cc-opt="-I/home/luser/libressl/build/include" \
--with-ld-opt="-lstdc++ -L/home/luser/.local/lib" --with-ld-opt="-lstdc++ -L/home/luser/libressl/build/ssl -L/home/luser/libressl/build/crypto"
make -j$(nproc) make -j$(nproc)
nginx/install.sh
+1 -1
View File
@@ -17,7 +17,7 @@ strip -s /usr/lib/nginx/modules/*.so
apk add --no-cache --virtual .gettext gettext apk add --no-cache --virtual .gettext gettext
mv /usr/bin/envsubst /tmp/ mv /usr/bin/envsubst /tmp/
runDeps="libintl libxml2 musl zlib tzdata ca-certificates pcre brotli-libs libxslt geoip libstdc++ c-ares" runDeps="libintl libxml2 musl zlib tzdata ca-certificates pcre brotli-libs libxslt geoip libstdc++ c-ares libprotobuf re2"
apk add --no-cache $runDeps apk add --no-cache $runDeps
apk del .gettext apk del .gettext
mv /tmp/envsubst /usr/local/bin/ mv /tmp/envsubst /usr/local/bin/