Docker fixes

.dockerignore

@@ -28,3 +28,4 @@ sist2
 **/ext_libwpd
 **/core
 *.a
+tmp_scan/

CMakeLists.txt

@@ -21,7 +21,6 @@ set(ARGPARSE_SHARED off)
 add_subdirectory(third-party/argparse)
 
 add_executable(sist2
-
         src/main.c
         src/sist.h
         src/io/walk.h src/io/walk.c

Dockerfile

@@ -3,11 +3,11 @@ MAINTAINER simon987 <me@simon987.net>
 
 WORKDIR /build/
 COPY . .
-RUN cmake -DSIST_PLATFORM=x64_linux -DSIST_DEBUG=off -DBUILD_TESTS=off -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake .
+RUN cmake -DSIST_PLATFORM=x64_linux -DSIST_DEBUG=on -DBUILD_TESTS=off -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake .
 RUN make -j$(nproc)
-RUN strip sist2
+RUN strip sist2 || mv sist2_debug sist2
 
-FROM ubuntu:21.10
+FROM --platform="linux/amd64" ubuntu:21.10
 
 RUN apt update && apt install -y curl libasan5 && rm -rf /var/lib/apt/lists/*
 

third-party/libscan/CMakeLists.txt

@@ -6,10 +6,26 @@ set(CMAKE_C_STANDARD 11)
 option(BUILD_TESTS "Build tests" on)
 
 add_subdirectory(third-party/antiword)
-add_compile_definitions(
+if (SIST_DEBUG)
+    add_compile_definitions(
+            antiword
+            DEBUG
+    )
+else()
+    add_compile_definitions(
             antiword
             NDEBUG
-)
+    )
+    target_compile_options(
+            antiword
+            PRIVATE
+            -g
+            -fstack-protector
+            -fno-omit-frame-pointer
+            -fsanitize=address
+            -fno-inline
+    )
+endif()
 
 add_library(
         scan