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

docker: bump base image to ubuntu 24.04 #435

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FAABRIC_VERSION=0.20.0
FAABRIC_CLI_IMAGE=faasm.azurecr.io/faabric:0.20.0
FAABRIC_VERSION=0.21.0
FAABRIC_CLI_IMAGE=faasm.azurecr.io/faabric:0.21.0
COMPOSE_PROJECT_NAME=faabric-dev
CONAN_CACHE_MOUNT_SOURCE=./conan-cache/
12 changes: 6 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
container:
image: faasm.azurecr.io/faabric:0.20.0
image: faasm.azurecr.io/faabric:0.21.0
env:
DEPLOYMENT_TYPE: gha-ci
steps:
Expand All @@ -34,7 +34,7 @@ jobs:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
container:
image: faasm.azurecr.io/faabric:0.20.0
image: faasm.azurecr.io/faabric:0.21.0
steps:
- name: "Check out code"
uses: actions/checkout@v4
Expand All @@ -45,7 +45,7 @@ jobs:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
container:
image: faasm.azurecr.io/faabric:0.20.0
image: faasm.azurecr.io/faabric:0.21.0
steps:
- name: "Check out code"
uses: actions/checkout@v4
Expand All @@ -65,7 +65,7 @@ jobs:
REDIS_QUEUE_HOST: redis
REDIS_STATE_HOST: redis
container:
image: faasm.azurecr.io/faabric:0.20.0
image: faasm.azurecr.io/faabric:0.21.0
options: --privileged
services:
redis:
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
REDIS_QUEUE_HOST: redis
REDIS_STATE_HOST: redis
container:
image: faasm.azurecr.io/faabric:0.20.0
image: faasm.azurecr.io/faabric:0.21.0
options: --privileged
services:
redis:
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
REDIS_QUEUE_HOST: redis
REDIS_STATE_HOST: redis
container:
image: faasm.azurecr.io/faabric:0.20.0
image: faasm.azurecr.io/faabric:0.21.0
services:
redis:
image: redis
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.20.0
0.21.0
4 changes: 2 additions & 2 deletions docker/faabric-base.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:22.04
FROM ubuntu:24.04

# Configure APT repositories
ARG LLVM_VERSION_MAJOR
Expand All @@ -11,7 +11,7 @@ RUN apt update \
wget \
# LLVM APT Repo config
&& wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc \
&& add-apt-repository -y "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${LLVM_VERSION_MAJOR} main"
&& add-apt-repository -y "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-${LLVM_VERSION_MAJOR} main"

# Install APT packages
RUN apt update && apt install -y \
Expand Down
4 changes: 2 additions & 2 deletions docker/faabric.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM faasm.azurecr.io/faabric-base:0.15.0
FROM faasm.azurecr.io/faabric-base:0.21.0
ARG FAABRIC_VERSION

# faabic-base image is not re-built often, so tag may be behind
Expand Down Expand Up @@ -30,7 +30,7 @@ RUN ./bin/create_venv.sh \
RUN echo "set auto-load safe-path /" > /root/.gdbinit

# CLI setup
ENV TERM xterm-256color
ENV TERM=xterm-256color

RUN echo ". /code/faabric/bin/workon.sh" >> ~/.bashrc
CMD ["/bin/bash", "-l"]
1 change: 1 addition & 0 deletions include/faabric/util/bytes.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <algorithm>
#include <cstdint>
#include <iomanip>
#include <list>
#include <span>
Expand Down
1 change: 1 addition & 0 deletions include/faabric/util/files.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#pragma once

#include <cstdint>
#include <faabric/util/exception.h>
#include <string>
#include <vector>
Expand Down
2 changes: 2 additions & 0 deletions src/planner/Planner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ static void releaseHostMpiPort(std::shared_ptr<Host> host, int mpiPort)
throw std::runtime_error("Requested to free unavailable MPI port!");
}

#ifndef NDEBUG
static void printHostState(std::map<std::string, std::shared_ptr<Host>> hostMap,
const std::string& logLevel = "debug")
{
Expand Down Expand Up @@ -147,6 +148,7 @@ static void printHostState(std::map<std::string, std::shared_ptr<Host>> hostMap,
SPDLOG_ERROR("Unrecognised log level: {}", logLevel);
}
}
#endif

// ----------------------
// Planner
Expand Down
Loading