Skip to content

Commit 7198459

Browse files
authored
Bump base to ubuntu:22.04 (#108)
* gh: bump version for new ubuntu base * docker: bump ubuntu base in llvm dockerfile * docker: bump faabric-base version in cpp-sysroot * gha: use ubuntu-latest around
1 parent 088b314 commit 7198459

File tree

5 files changed

+13
-19
lines changed

5 files changed

+13
-19
lines changed

.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
SYSROOT_VERSION=0.2.0
2-
SYSROOT_CLI_IMAGE=faasm/cpp-sysroot:0.2.0
1+
SYSROOT_VERSION=0.2.1
2+
SYSROOT_CLI_IMAGE=faasm/cpp-sysroot:0.2.1
33
COMPOSE_PROJECT_NAME=cpp-dev

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717

1818
checks:
1919
if: github.event.pull_request.draft == false
20-
runs-on: ubuntu-20.04
20+
runs-on: ubuntu-latest
2121
container:
22-
image: faasm/cpp-sysroot:0.2.0
22+
image: faasm/cpp-sysroot:0.2.1
2323
steps:
2424
# --- Update code ---
2525
- name: "Checkout code"

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.2.0
1+
0.2.1

docker/cpp-sysroot.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM faasm/llvm:13.0.1 as llvm
22

33
# faabric-base image is not re-built often, so tag may be behind
4-
FROM faasm/faabric-base:0.4.0
4+
FROM faasm/faabric-base:0.4.1
55
SHELL ["/bin/bash", "-c"]
66
ENV CPP_DOCKER="on"
77

docker/llvm.dockerfile

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,25 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:22.04
22

33
SHELL ["/bin/bash", "-c"]
44
ENV CPP_DOCKER="on"
55

66
# Install APT dependencies
77
ARG DEBIAN_FRONTEND=noninteractive
88
RUN apt update \
9-
&& apt install -y \
10-
curl \
11-
gpg \
12-
software-properties-common \
13-
wget \
14-
&& wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
15-
&& add-apt-repository -y -n "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main" \
16-
&& add-apt-repository -y -n ppa:ubuntu-toolchain-r/test \
17-
&& apt update \
18-
&& apt upgrade -y \
199
&& apt install -y \
2010
autoconf \
21-
clang-13 \
2211
build-essential \
12+
clang-13 \
13+
curl \
2314
git \
15+
gpg \
2416
ninja-build \
2517
pkg-config \
2618
python3-dev \
2719
python3-pip \
28-
python3-venv
20+
python3-venv \
21+
software-properties-common \
22+
wget
2923

3024
# Install up-to-date CMake
3125
RUN apt remove --purge --auto-remove cmake \

0 commit comments

Comments
 (0)