From bf39fc74395ae045c81c572bbd29f90b10193b7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=B6hling=2C=20Maximilian?= Date: Thu, 25 Jul 2024 16:51:55 +0200 Subject: [PATCH] SQUASH --- .github/workflows/ci-cpp.yaml | 1 - cpp/Dockerfile.build | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-cpp.yaml b/.github/workflows/ci-cpp.yaml index 307859e2..46d6e093 100644 --- a/.github/workflows/ci-cpp.yaml +++ b/.github/workflows/ci-cpp.yaml @@ -29,7 +29,6 @@ env: VAAS_PASSWORD: ${{secrets.VAAS_PASSWORD}} jobs: cpp-build: - needs: cpp-toolchain name: Build & Test C++ SDK runs-on: ubuntu-latest container: ghcr.io/gdatasoftwareag/vaas/cpp-toolchain diff --git a/cpp/Dockerfile.build b/cpp/Dockerfile.build index 1e90f12b..533fd089 100644 --- a/cpp/Dockerfile.build +++ b/cpp/Dockerfile.build @@ -2,14 +2,14 @@ FROM ubuntu:22.04 RUN apt-get update -qq && \ - # install basic build tools - apt-get install -y --no-install-recommends git ca-certificates curl zip unzip tar build-essential cmake make libssl3 libssl-dev && \ + # install dependencies + apt-get install -y --no-install-recommends git ca-certificates curl zip unzip tar build-essential cmake make pkg-config libssl3 libssl-dev linux-libc-dev && \ # install vcpkg cd /usr/local && \ git clone https://github.com/microsoft/vcpkg.git && \ cd vcpkg && ./bootstrap-vcpkg.sh -ENV VCPKG_ROOT="/usr/local/vcpkg/"" +ENV VCPKG_ROOT="/usr/local/vcpkg/" ENV PATH="$VCPKG_ROOT:$PATH"