Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump docker ubuntu jammy #1933

Merged
merged 3 commits into from Mar 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/build.sh
Expand Up @@ -58,6 +58,6 @@ fi

mkdir -p build
cd build
cmake -DCMAKE_INSTALL_PREFIX=$CYCLONEDDS_INSTALL_PREFIX -DBUILD_IDLC=ON ..
cmake -DCMAKE_INSTALL_PREFIX=$CYCLONEDDS_INSTALL_PREFIX -DBUILD_IDLC=ON -DBUILD_EXAMPLES=ON ..
cmake --build .
cmake --build . --target install
2 changes: 1 addition & 1 deletion scripts/docker/Dockerfile
Expand Up @@ -8,7 +8,7 @@

# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause

FROM ubuntu:bionic
FROM ubuntu:jammy

# Dependencies required to build cyclonedds
RUN apt update && apt install -y \
Expand Down
4 changes: 2 additions & 2 deletions scripts/docker/README.md
Expand Up @@ -5,8 +5,8 @@ Additionally you can also build a docker image with pre-built cyclonedds example

# Bulid docker image
There are two docker images you can build.
- **ubuntu:cyclonedds** : ubuntu bionic based image that contains dependencies to build cyclonedds.
- **cyclonedds:latest** : ubuntu bionic based image with pre-built cyclonedds core & applications (based on the checked out revision).
- **ubuntu:cyclonedds** : ubuntu jammy based image that contains dependencies to build cyclonedds.
- **cyclonedds:latest** : ubuntu jammy based image with pre-built cyclonedds core & applications (based on the checked out revision).

## How to build the images

Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/build_cyclonedds.sh
Expand Up @@ -21,6 +21,6 @@ echo "WORKSPACE is $WORKSPACE"

docker run -it --rm -v $WORKSPACE/:/cyclonedds --workdir /cyclonedds $IMAGE_NAME /bin/bash -c "./scripts/build.sh clean"
# Launch the docker after build
docker run --name $CONTAINER_NAME -it -v $WORKSPACE/:/cyclonedds --workdir /cyclonedds $IMAGE_NAME /bin/bash
docker run --name $CONTAINER_NAME -it --rm -v $WORKSPACE/:/cyclonedds --workdir /cyclonedds $IMAGE_NAME /bin/bash
# If you want to connect to the above docker to run cyclonedds examples (multiple apps in separate terminals) , use the below command
# docker exec -it cyclonedds /bin/bash