Skip to content

Commit 8c6e90f

Browse files
committed
Upgrade Ubuntu 22.04 -> 24.04
1 parent 5d3cb85 commit 8c6e90f

File tree

4 files changed

+10
-14
lines changed

4 files changed

+10
-14
lines changed

.github/workflows/ci.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
test:
13-
runs-on: ubuntu-22.04
13+
runs-on: ubuntu-24.04
1414
services:
1515
rabbitmq:
1616
image: rabbitmq
@@ -89,7 +89,7 @@ jobs:
8989
build:
9090
needs: test
9191
if: github.ref == 'refs/heads/release/3.0' && github.repository_owner == 'ia-toki'
92-
runs-on: ubuntu-22.04
92+
runs-on: ubuntu-24.04
9393
env:
9494
CONTAINER_REGISTRY_USERNAME: ${{ secrets.CONTAINER_REGISTRY_USERNAME }}
9595
CONTAINER_REGISTRY_TOKEN: ${{ secrets.CONTAINER_REGISTRY_TOKEN }}
@@ -150,7 +150,7 @@ jobs:
150150

151151
deploy-web:
152152
if: github.ref == 'refs/heads/master' && github.repository_owner == 'ia-toki'
153-
runs-on: ubuntu-22.04
153+
runs-on: ubuntu-24.04
154154
env:
155155
WEB_HOST: ${{ secrets.WEB_HOST }}
156156
WEB_KNOWN_HOSTS: ${{ secrets.WEB_KNOWN_HOSTS }}
@@ -192,7 +192,7 @@ jobs:
192192
needs: build
193193
# if: github.ref == 'refs/heads/master' && github.repository_owner == 'ia-toki'
194194
if: False
195-
runs-on: ubuntu-22.04
195+
runs-on: ubuntu-24.04
196196
steps:
197197
- uses: actions/checkout@v4
198198
with:

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
release:
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111
env:
1212
CONTAINER_REGISTRY_USERNAME: ${{ secrets.CONTAINER_REGISTRY_USERNAME }}
1313
CONTAINER_REGISTRY_TOKEN: ${{ secrets.CONTAINER_REGISTRY_TOKEN }}

deployment/ansible/roles/docker-install/tasks/main.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
- block:
22
- name: Install docker
3-
pip:
4-
name: docker
5-
6-
- name: Downgrade requests # https://github.com/docker/docker-py/issues/3113
7-
pip:
8-
name: requests
9-
version: 2.28.1
3+
apt:
4+
name: python3-docker
5+
state: present
106

117
- name: Install docker.io
128
apt:

judgels-backends/judgels-grader-app/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
RUN apt-get update \
44
&& apt-get install -y git make gcc libcap-dev
@@ -12,7 +12,7 @@ RUN git clone --depth 1 git://git.ucw.cz/moe.git; \
1212
gcc -o iwrapper iwrapper.c
1313

1414

15-
FROM ubuntu:22.04
15+
FROM ubuntu:24.04
1616

1717
ENV CARGO_HOME /usr
1818
ENV RUSTUP_HOME /usr

0 commit comments

Comments
 (0)