update nginx data

ingress-nginx-controller.yaml

@@ -2,12 +2,49 @@
 package:
   name: ingress-nginx-controller
   version: 1.8.0
-  epoch: 4
+  epoch: 5
   description: "Ingress-NGINX Controller for Kubernetes"
   copyright:
     - license: Apache-2.0
   dependencies:
     runtime:
+      - curl
+      - curl-dev
+      - openssh-client
+      - ca-certificates-bundle
+      - ca-certificates
+      - openssl
+      - openssl-dev
+      - opentracing-cpp
+      - jaeger-cpp
+      - msgpack
+      - datadog-cpp
+      - yaml-cpp
+      - zipkin-cpp
+      - ssdeep
+      - luajit
+      - luajit-dev
+      - lua-cjson
+      - lua-resty-balancer
+      - lua-resty-cache
+      - lua-resty-cookie
+      - lua-resty-core
+      - lua-resty-dns
+      - lua-resty-global-throttle
+      - lua-resty-http
+      - lua-resty-ipmatcher
+      - lua-resty-lock
+      - lua-resty-memcached
+      - lua-resty-redis
+      - lua-resty-string
+      - lua-resty-upload
+      - ca-certificates-bundle
+      - brotli-dev
+      - gd-dev
+      - geoip-dev
+      - libmaxminddb-dev
+      - libxml2-dev
+      - libxslt-dev
 
 environment:
   contents:
@@ -162,6 +199,8 @@ pipeline:
       setcap cap_net_bind_service=+ep ${{targets.destdir}}/nginx-ingress-controller \
       && setcap -v cap_net_bind_service=+ep ${{targets.destdir}}/nginx-ingress-controller
 
+      getcap ${{targets.destdir}}/nginx-ingress-controller
+
   - uses: fetch
     with:
       uri: https://nginx.org/download/nginx-${{vars.NGINX_VERSION}}.tar.gz
@@ -265,7 +304,12 @@ pipeline:
       cat /etc/ld.so.conf
 
       mkdir -p ${{targets.destdir}}/etc/nginx/
-      cp -ar /etc/nginx/ ${{targets.destdir}}/etc/nginx/
+
+      # Geo ip data from nginx image
+      cp -ar images/nginx/rootfs/etc/nginx/. ${{targets.destdir}}/etc/nginx/
+
+      # Lua code copied into the target
+      cp -ar rootfs/etc/nginx/. ${{targets.destdir}}/etc/nginx/
 
       # Get Brotli source and deps
       echo "::::::::::::::::::::::::::::::::::::::"
@@ -482,8 +526,8 @@ pipeline:
        echo ":::: SETCAP DUMB INIT                  ::::"
        echo "::::::::::::::::::::::::::::::::::::::::::"
 
-      setcap cap_net_bind_service=+ep /usr/bin/dumb-init \
-        && setcap -v cap_net_bind_service=+ep /usr/bin/dumb-init
+      setcap cap_net_bind_service=+ep ${{targets.destdir}}/usr/bin/dumb-init \
+        && setcap -v cap_net_bind_service=+ep ${{targets.destdir}}/usr/bin/dumb-init
 
 
       echo "::::::::::::::::::::::::::::::::::::::::::::"
@@ -512,6 +556,10 @@ pipeline:
       ${BUILD_PATH}/ngx_http_geoip2_module-"${{vars.GEOIP2_VERSION}}"  \
       ${BUILD_PATH}/ngx_brotli
 
+      # Create symlinks to redirect nginx logs to stdout and stderr docker log collector
+      ln -sf /dev/stdout /var/log/nginx/access.log \
+      && ln -sf /dev/stderr /var/log/nginx/error.log
+
 update:
   enabled: true
   github:

lua-cjson.yaml

@@ -1,7 +1,7 @@
 package:
   name: lua-cjson
   version: 2.1.0.10
-  epoch: 2
+  epoch: 3
   description: "Lua CJSON is a fast JSON encoding/parsing module for Lua"
   copyright:
     - license: MIT
@@ -11,12 +11,13 @@ package:
 environment:
   contents:
     packages:
-      - wolfi-baselayout
+      - wolfi-base
       - busybox
-      - build-base
       - ca-certificates-bundle
+      - build-base
       - luajit
       - luajit-dev
+      - automake
 
 pipeline:
   - uses: fetch
@@ -25,21 +26,20 @@ pipeline:
       expected-sha256: 0c551d6898f89f876e48730f9b55790d0ba07d5bc0aa6c76153277f63c19489f
       strip-components: 1
 
-  - name: "Configure"
-    runs: |
-      export LUAJIT_LIB=/usr/lib
-      export LUA_LIB_DIR="$LUAJIT_LIB/lua"
-      export LUAJIT_INC=/usr/include/luajit-2.1
-
-      ln -sf /usr/bin/luajit /usr/bin/lua
-      ln -sf "$LUAJIT_INC" /usr/include/lua
-
+  - runs: |
+      export LUAJIT_LIB="$(pkgconf --variable=libdir luajit)"
+       export LUAJIT_INC="$(pkgconf --variable=includedir luajit)"
+       export LUA_LIB_DIR="$LUAJIT_LIB/lua"
+       ln -s "$LUAJIT_INC" /usr/include/lua
        export LUA_INCLUDE_DIR=/usr/include/luajit-2.1
-       ln -sf $LUA_INCLUDE_DIR /usr/include/lua5.1
-
-       make all
+       ln -s $LUA_INCLUDE_DIR /usr/include/lua5.1
 
-       make DESTDIR="${{targets.destdir}}" install
+       make -C "." install DESTDIR="${{targets.destdir}}"
 
 update:
-  enabled: false
+  ignore-regex-patterns:
+    - empty
+  enabled: true
+  github:
+    identifier: openresty/lua-cjson
+    use-tag: true

lua-resty-ipmatcher.yaml

@@ -1,7 +1,7 @@
 package:
   name: lua-resty-ipmatcher
   version: 0.6.1
-  epoch: 0
+  epoch: 1
   description: "High-performance match IP address for Nginx + Lua"
   copyright:
     - license: Apache-2.0
@@ -26,8 +26,10 @@ pipeline:
 
   - name: "Configure lua-resty-ipmatcher"
     runs: |
-      export INST_LUADIR=/usr/local/lib/lua
-      make DESTDIR="${{targets.destdir}}" install
+      INST_LUADIR=${{targets.destdir}}/usr/local/lib/lua make -C "." install DESTDIR="${{targets.destdir}}"
 
 update:
-  enabled: false
+  enabled: true
+  github:
+    identifier: api7/lua-resty-ipmatcher
+    strip-prefix: v

mimalloc.yaml

@@ -1,7 +1,7 @@
 package:
   name: mimalloc
   version: 1.7.6
-  epoch: 0
+  epoch: 1
   description: "A compact general purpose allocator with excellent performance"
   copyright:
     - license: MIT
@@ -15,22 +15,18 @@ environment:
       - busybox
       - ca-certificates-bundle
       - build-base
-      - cmake
 
 pipeline:
   - uses: fetch
     with:
       uri: https://github.com/microsoft/mimalloc/archive/refs/tags/v${{package.version}}.tar.gz
       expected-sha256: d74f86ada2329016068bc5a243268f1f555edd620b6a7d6ce89295e7d6cf18da
-      strip-components: 1
 
-  - name: 'Configure mimalloc'
-    runs: |
-      cmake .
+  - uses: cmake/configure
 
-  - uses: autoconf/make
+  - uses: cmake/build
 
-  - uses: autoconf/make-install
+  - uses: cmake/install
 
 subpackages:
   - name: "mimalloc-dev"