Skip to content

Commit

Permalink
Fix apt container ci build configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
pnoltes committed Jun 15, 2024
1 parent d28280e commit 9dea26d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .devcontainer/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,10 @@ RUN conan profile detect
# Build image using apt dependencies
FROM build as apt-build

# Install celix dependencies
# Install celix dependencies (note git needed for cloning gtest)
RUN DEBIAN_FRONTEND="noninteractive" sudo apt-get update && \
DEBIAN_FRONTEND="noninteractive" sudo apt-get install -y --no-install-recommends \
git \
civetweb \
libavahi-compat-libdnssd-dev \
libcivetweb-dev \
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,10 @@ jobs:
docker build -t apache/celix-apt-build:latest --target apt-build -f .devcontainer/Containerfile
- name: Build and test Celix the conan container image
run: |
docker run --rm -v $(pwd):/workspace --userns=keep-id apache/celix-conan-build:latest /bin/bash -c \
"cd /workspace && \
cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_EXPERIMENTAL=ON -DENABLE_TESTING=ON -DRSA_JSON_RPC=ON -DRSA_SHM=ON \
docker run --rm -v $(pwd):/workspace --userns=keep-id apache/celix-apt-build:latest /bin/bash -c \
"mkdir /workspace/build && cd /workspace/build && \
cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_EXPERIMENTAL=ON -DENABLE_TESTING=ON -DRSA_JSON_RPC=ON \
-DRSA_REMOTE_SERVICE_ADMIN_SHM_V2=ON .. && \
cd build && \
make -j && \
ctest --output-on-failure"
Expand Down

0 comments on commit 9dea26d

Please sign in to comment.