From 35fb2976987e93034430aa6d548978fba6a9e53b Mon Sep 17 00:00:00 2001 From: Kylie Smith Date: Thu, 12 Oct 2023 16:43:38 +1000 Subject: [PATCH] Fixed Docker build - Broke for some reason? --- Dockerfile | 9 +++++++-- Dockerfile-legacy | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index e6ffb56..1f0aca4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,10 +38,15 @@ RUN cmake .. -DCMAKE_BUILD_TYPE=Release && make FROM ubuntu:23.10 +# Install dependencies. +RUN set -ex; \ + apt-get update; \ + apt-get install -y libssl3; + # Copy the build artificat. -COPY --from=build /app/build/bin /app +COPY --from=build /app/build/bin/ardos /app/ardos +COPY --from=build /app/build/bin/libuv.s* /usr/local/lib/ COPY --from=build /usr/local/lib/lib* /usr/local/lib/ -COPY --from=build /app/build/libs/libuv/libuv.s* /usr/local/lib/ RUN ldconfig diff --git a/Dockerfile-legacy b/Dockerfile-legacy index 8f62450..15cedb2 100644 --- a/Dockerfile-legacy +++ b/Dockerfile-legacy @@ -38,10 +38,15 @@ RUN cmake .. -DCMAKE_BUILD_TYPE=Release -DARDOS_USE_LEGACY_CLIENT=ON && make FROM ubuntu:23.10 +# Install dependencies. +RUN set -ex; \ + apt-get update; \ + apt-get install -y libssl3; + # Copy the build artificat. -COPY --from=build /app/build/bin /app +COPY --from=build /app/build/bin/ardos /app/ardos +COPY --from=build /app/build/bin/libuv.s* /usr/local/lib/ COPY --from=build /usr/local/lib/lib* /usr/local/lib/ -COPY --from=build /app/build/libs/libuv/libuv.s* /usr/local/lib/ RUN ldconfig