From 30b19505cea2268363c883a0c283bb95ce156fae Mon Sep 17 00:00:00 2001 From: Daniel-Eisenberg <59121493+Daniel-Eisenberg@users.noreply.github.com> Date: Tue, 30 Sep 2025 18:19:54 +0300 Subject: [PATCH] Fix alpine ca (#45) * add attachment load script * update file path * update file path * update file path --------- Co-authored-by: Daniel Eisenberg --- docker/openappsec-envoy-attachments/CMakeLists.txt | 5 ++++- docker/openappsec-envoy-attachments/Dockerfile | 4 ++++ .../openappsec-envoy-attachments/prepare_attachment.sh | 9 +++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 docker/openappsec-envoy-attachments/prepare_attachment.sh diff --git a/docker/openappsec-envoy-attachments/CMakeLists.txt b/docker/openappsec-envoy-attachments/CMakeLists.txt index a37fc2e..40c5aa4 100755 --- a/docker/openappsec-envoy-attachments/CMakeLists.txt +++ b/docker/openappsec-envoy-attachments/CMakeLists.txt @@ -1,5 +1,7 @@ message(STATUS "OUTPUT_ENVOY_FILTERS_DOCKER_IMAGE = ${OUTPUT_ENVOY_FILTERS_DOCKER_IMAGE}") +install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/prepare_attachment.sh DESTINATION ${CMAKE_INSTALL_PREFIX}) + add_custom_command( OUTPUT ${CMAKE_INSTALL_PREFIX}/envoy-filters-docker.img COMMAND docker build -t envoy-filters-docker -f ${CMAKE_CURRENT_SOURCE_DIR}/Dockerfile ${CMAKE_INSTALL_PREFIX} @@ -7,4 +9,5 @@ add_custom_command( COMMAND docker image save envoy-filters-docker -o ${CMAKE_INSTALL_PREFIX}/envoy-filters-docker.img ) -add_custom_target(envoy-filters-docker DEPENDS ${CMAKE_INSTALL_PREFIX}/envoy-filters-docker.img) \ No newline at end of file +add_custom_target(envoy-filters-docker DEPENDS ${CMAKE_INSTALL_PREFIX}/envoy-filters-docker.img) + diff --git a/docker/openappsec-envoy-attachments/Dockerfile b/docker/openappsec-envoy-attachments/Dockerfile index b7d7c37..1bc2fbd 100755 --- a/docker/openappsec-envoy-attachments/Dockerfile +++ b/docker/openappsec-envoy-attachments/Dockerfile @@ -7,3 +7,7 @@ COPY lib/libnano_attachment.so /envoy/attachment/libnano_attachment.so COPY lib/libshmem_ipc_2.so /envoy/attachment/libshmem_ipc_2.so COPY lib/libnano_attachment_util.so /envoy/attachment/libnano_attachment_util.so COPY lib/libosrc_compression_utils.so /envoy/attachment/libosrc_compression_utils.so + +COPY prepare_attachment.sh /prepare_attachment.sh +RUN chmod +x /prepare_attachment.sh + diff --git a/docker/openappsec-envoy-attachments/prepare_attachment.sh b/docker/openappsec-envoy-attachments/prepare_attachment.sh new file mode 100644 index 0000000..65f0b34 --- /dev/null +++ b/docker/openappsec-envoy-attachments/prepare_attachment.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +set -x + +echo "Preparing shared Envoy attachment files..." +mkdir -p /envoy/attachment/shared && \ +cp -r /envoy/attachment/lib* /envoy/attachment/shared && \ +cp /envoy/attachment/versions/$ENVOY_VERSION/lib* /envoy/attachment/shared +