Fix dependencies for PCRE2

.dockerignore

@@ -0,0 +1,3 @@
+**/dist
+**/src
+**/*.tar.gz

.gitlab-ci.yml

@@ -11,14 +11,12 @@ variables:
   needs: [ ]
   before_script:
     - apt -qq update
-    - apt install -y --no-install-recommends -qq build-essential ca-certificates curl tar
+    - apt install -y --no-install-recommends -qq build-essential ca-certificates cmake curl libreadline-dev libsystemd-dev tar
 
 lua:
   <<: *build-job
   stage: dependencies
-  script:
+  script: make -C deps/lua
-    - apt -qq update && apt install -qq -y --no-install-recommends libreadline-dev
-    - make -C deps/lua
   artifacts:
     expire_in: 14 days
     paths: [ "deps/lua/dist" ]
@@ -26,9 +24,7 @@ lua:
 pcre2:
   <<: *build-job
   stage: dependencies
-  script:
+  script: make -C deps/pcre2
-    - apt -qq update && apt install -qq -y --no-install-recommends cmake
-    - make -C deps/pcre2
   artifacts:
     expire_in: 14 days
     paths: [ "deps/pcre2/dist" ]
@@ -44,9 +40,7 @@ quictls:
 haproxy:
   <<: *build-job
   stage: haproxy
-  script:
+  script: make -C haproxy
-    - apt -qq update && apt install -qq -y --no-install-recommends git libsystemd-dev
-    - make -C haproxy
   needs:
     - job: lua
       artifacts: true

haproxy/Makefile

@@ -25,7 +25,7 @@ HAPROXY_MAKE_ARGS := DEBUG="-DDEBUG_STRICT -DDEBUG_MEMORY_POOLS" \
                      USE_PCRE2_JIT=1 \
                      USE_STATIC_PCRE2=1 \
                      PCRE2_INC="../$(DEP_ROOT_PCRE2)/dist/include" \
-                     PCRE2_LIB="../$(DEP_ROOT_PCRE2)/dist/lib64" \
+                     PCRE2_LIB="../$(DEP_ROOT_PCRE2)/dist/lib" \
                      USE_PROMEX=1 \
                      USE_QUIC=1 \
                      USE_SLZ=1 \