From 54fa8f546539b0557328f3e77ed2a28b206587bd Mon Sep 17 00:00:00 2001 From: danbugs Date: Mon, 25 Dec 2023 14:42:33 -0800 Subject: [PATCH] update CI and Dockerfile Signed-off-by: danbugs --- .github/workflows/ci-cd.yml | 6 ------ Dockerfile-UserUpdater | 8 ++++++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 0a8292f..1733bff 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -66,12 +66,6 @@ jobs: override: true target: ${{ matrix.target }} - - name: Install specific version of OpenSSL (Ubuntu) - if: matrix.os == 'ubuntu-latest' - run: | - sudo apt-get update - sudo apt-get install -y openssl=1.1.1f-1ubuntu2 libssl1.1 - - if: matrix.os == 'windows-latest' name: Install PostgreSQL uses: ikalnytskyi/action-setup-postgres@v4 diff --git a/Dockerfile-UserUpdater b/Dockerfile-UserUpdater index ac9a3e1..c6d8c11 100644 --- a/Dockerfile-UserUpdater +++ b/Dockerfile-UserUpdater @@ -1,8 +1,12 @@ FROM debian:buster-slim -# Install necessary packages including PostgreSQL client libraries, CA certificates, and specific OpenSSL version +# Install necessary packages including PostgreSQL client libraries +# and CA certificates RUN apt-get update && \ - apt-get install -y libpq5 ca-certificates openssl=1.1.1f-1ubuntu2 libssl1.1 && \ + apt-get install -y libpq5 ca-certificates openssl libssl-dev && \ + # Create a symlink for libssl.so.3 to point to libssl.so.1 + ln -s /usr/lib/x86_64-linux-gnu/libssl.so.1 /usr/lib/x86_64-linux-gnu/libssl.so.3 && \ + # Clean up rm -rf /var/lib/apt/lists/* # Copy the pidgtm binary and set permissions