Skip to content

Commit 70c2d88

Browse files
committed
feat docker: ubuntu-24.04 images in CI
1 parent e0f3f41 commit 70c2d88

File tree

3 files changed

+49
-1
lines changed

3 files changed

+49
-1
lines changed
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Build and publish ubuntu-24.04-userver images
2+
3+
'on':
4+
schedule:
5+
- cron: '30 5 * * 6' # Every Saturday at 5:30
6+
workflow_dispatch:
7+
release:
8+
types: [published]
9+
10+
jobs:
11+
build_and_publish_base:
12+
runs-on: ubuntu-24.04
13+
name: Build and publish base images
14+
permissions:
15+
contents: read
16+
packages: write
17+
env:
18+
USERVER_IMAGE_TAG: ${{ github.event.release.tag_name || 'latest' }}
19+
steps:
20+
- uses: actions/checkout@v4
21+
- name: Login to GitHub Container Registry
22+
uses: docker/login-action@v3
23+
with:
24+
registry: ghcr.io
25+
username: ${{ github.actor }}
26+
password: ${{ secrets.GITHUB_TOKEN }}
27+
- name: Build the ubuntu-24.04-userver-base Docker image
28+
run: |
29+
docker build -t ghcr.io/userver-framework/ubuntu-24.04-userver-base:${USERVER_IMAGE_TAG} -f scripts/docker/ubuntu-24.04-base.dockerfile .
30+
docker push ghcr.io/userver-framework/ubuntu-24.04-userver-base:${USERVER_IMAGE_TAG}
31+
- name: Build the ubuntu-22.04-userver Docker image
32+
run: |
33+
docker build -t ghcr.io/userver-framework/ubuntu-24.04-userver:${USERVER_IMAGE_TAG} -f scripts/docker/ubuntu-24.04-userver.dockerfile .
34+
docker push ghcr.io/userver-framework/ubuntu-24.04-userver:${USERVER_IMAGE_TAG}

scripts/docker/ubuntu-24.04-base.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN \
2727

2828

2929
COPY scripts/clickhouse/ubuntu-install-clickhouse.sh /userver_tmp/
30-
RUN /userver_tmp/ubuntu-install-clickhouse.sh
30+
# RUN /userver_tmp/ubuntu-install-clickhouse.sh
3131

3232
COPY scripts/rabbitmq/ubuntu_install_rabbitmq_dev.sh /userver_tmp/
3333
RUN /userver_tmp/ubuntu_install_rabbitmq_dev.sh
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM ghcr.io/userver-framework/ubuntu-22.04-userver-base:latest
2+
3+
# The Dockerfile contains:
4+
# * all userver build dependencies
5+
# * all userver test dependencies (e.g. for testsuite)
6+
# * built userver itself
7+
8+
RUN apt install -y clang-18
9+
RUN git clone https://github.com/userver-framework/userver \
10+
&& cd userver \
11+
&& BUILD_OPTIONS='-DUSERVER_FEATURE_CLICKHOUSE=OFF -DCMAKE_CXX_COMPILER=clang++-18 -DCMAKE_C_COMPILER=clang-18' \
12+
./scripts/build_and_install_all.sh \
13+
&& cd .. \
14+
&& rm -rf userver/

0 commit comments

Comments
 (0)