Skip to content

Commit

Permalink
CI: update docker ubuntu version 22.04 -> 24.04
Browse files Browse the repository at this point in the history
Signed-off-by: Evgeny Malygin <[email protected]>
  • Loading branch information
678098 committed Jun 24, 2024
1 parent 95a8869 commit 8d4d9a1
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 13 deletions.
19 changes: 17 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -311,12 +311,27 @@ jobs:
- name: Run ShellCheck
uses: ludeeus/action-shellcheck@master

docker-build-check:
name: "Build [docker]"
docker_build_ubuntu:
name: "Docker [ubuntu]"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Docker Single-Node Workflow
run: docker compose -f docker/single-node/docker-compose.yaml up --build -d
- name: Docker Cluster Workflow
run: docker compose -f docker/cluster/docker-compose.yaml up --build -d

docker_build_macos:
name: Docker [macosx_${{ matrix.arch }}]
runs-on: ${{ matrix.os }}
strategy:
matrix:
include:
- os: macos-14
arch: arm64
steps:
- uses: actions/checkout@v4
- name: Docker Single-Node Workflow
run: docker compose -f docker/single-node/docker-compose.yaml up --build -d
- name: Docker Cluster Workflow
run: docker compose -f docker/cluster/docker-compose.yaml up --build -d
15 changes: 4 additions & 11 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
FROM docker.io/ubuntu:22.04 AS builder
FROM docker.io/ubuntu:24.04 AS builder

# Set up CA certificates first before installing other dependencies
RUN apt-get update && \
apt-get install -y ca-certificates && \
apt-get install -y --no-install-recommends \
build-essential \
gdb \
cmake \
curl \
python3.10 \
python3 \
ninja-build \
pkg-config \
bison \
Expand All @@ -18,14 +19,6 @@ RUN apt-get update && \
&& apt clean \
&& rm -rf /var/lib/apt/lists/*

# BDE build requires CMake > 3.24, which is not available in Ubuntu 22.04 yet
# Consider installation of cmake from apt once it's met BDE requirements
RUN mkdir -p /deps_build/CMake \
&& cd /deps_build/CMake \
&& curl -s -L -O https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-linux-x86_64.sh \
&& /bin/bash cmake-3.27.1-linux-x86_64.sh -- --skip-license --prefix=/usr/local \
&& rm -rf /deps_build

WORKDIR /workspace

COPY docker/build_deps.sh bin/build_deps.sh
Expand Down Expand Up @@ -55,7 +48,7 @@ RUN cd srcs/bmq \
&& mv /bmq/bin/bmqbrkr.tsk /bmq/bin/bmqbrkr \
&& mv /bmq/bin/bmqtool.tsk /bmq/bin/bmqtool

FROM docker.io/ubuntu:22.04
FROM docker.io/ubuntu:24.04

COPY --from=builder /bmq /usr/local

Expand Down
2 changes: 2 additions & 0 deletions docker/single-node/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
services:
bmqbrkr:
image: bmqbrkr:latest
platform: linux/amd64
build:
context: ../..
dockerfile: docker/Dockerfile
Expand All @@ -11,6 +12,7 @@ services:

bmqtool:
image: bmqbrkr:latest
platform: linux/amd64
build:
context: ../..
dockerfile: docker/Dockerfile
Expand Down

0 comments on commit 8d4d9a1

Please sign in to comment.