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

V2.6.x ubuntu24 fedora40 #4541

Merged
merged 2 commits into from
Jun 28, 2024
Merged
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
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -305,17 +305,17 @@ amd64-packages: amd64-centos amd64-ubuntu amd64-debian amd64-fedora amd64-opensu
amd64-almalinux: almalinux8 almalinux8-clang almalinux8-dbg almalinux9 almalinux9-clang almalinux9-dbg
amd64-centos: centos7 centos7-dbg centos8 centos8-clang centos8-dbg centos9 centos9-clang centos9-dbg
amd64-debian: debian10 debian10-dbg debian11 debian11-clang debian11-dbg debian12 debian12-clang debian12-dbg
amd64-fedora: fedora38 fedora38-clang fedora38-dbg fedora39 fedora39-clang fedora39-dbg
amd64-fedora: fedora38 fedora38-clang fedora38-dbg fedora39 fedora39-clang fedora39-dbg fedora40 fedora40-clang fedora40-dbg
amd64-opensuse: opensuse15 opensuse15-clang opensuse15-dbg
amd64-ubuntu: ubuntu16 ubuntu16-dbg ubuntu18 ubuntu18-dbg ubuntu20 ubuntu20-clang ubuntu20-dbg ubuntu22 ubuntu22-clang ubuntu22-dbg
amd64-ubuntu: ubuntu16 ubuntu16-dbg ubuntu18 ubuntu18-dbg ubuntu20 ubuntu20-clang ubuntu20-dbg ubuntu22 ubuntu22-clang ubuntu22-dbg ubuntu24 ubuntu24-clang ubuntu24-dbg

arm64-packages: arm64-centos arm64-debian arm64-ubuntu arm64-fedora arm64-opensuse arm64-almalinux
arm64-almalinux: almalinux8 almalinux9
arm64-centos: centos7 centos8 centos9
arm64-debian: debian10 debian11 debian12
arm64-fedora: fedora38 fedora39
arm64-fedora: fedora38 fedora39 fedora40
arm64-opensuse: opensuse15
arm64-ubuntu: ubuntu16 ubuntu18 ubuntu20 ubuntu22
arm64-ubuntu: ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24

almalinux%: build-almalinux% ;
centos%: build-centos% ;
Expand Down
55 changes: 55 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,34 @@ services:
- PKG_RELEASE=dbg-fedora39
- PROXYSQL_BUILD_TYPE=debug

####################################################################################################
fedora40_build:
extends:
service: _build
image: proxysql/packaging:build-fedora40
volumes:
- ./docker/images/proxysql/rhel-compliant/rpmmacros/rpmbuild/:/root/rpmbuild/
- ./docker/images/proxysql/rhel-compliant/rpmmacros/.rpmmacros:/root/.rpmmacros
- ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/
- ./:/opt/proxysql/
environment:
- PKG_RELEASE=fedora40
- PROXYSQL_BUILD_TYPE=clickhouse

fedora40_clang_build:
extends:
service: fedora40_build
image: proxysql/packaging:build-clang-fedora40
environment:
- PKG_RELEASE=fedora40-clang

fedora40_dbg_build:
extends:
service: fedora40_build
environment:
- PKG_RELEASE=dbg-fedora40
- PROXYSQL_BUILD_TYPE=debug

####################################################################################################
####################################################################################################
debian10_build:
Expand Down Expand Up @@ -319,6 +347,33 @@ services:
- PKG_RELEASE=dbg-ubuntu22
- PROXYSQL_BUILD_TYPE=debug

####################################################################################################
ubuntu24_build:
extends:
service: _build
image: proxysql/packaging:build-ubuntu24
volumes:
- ./docker/images/proxysql/deb-compliant/latest-package/ctl/:/root/ctl/
- ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/
- ./:/opt/proxysql/
environment:
- PKG_RELEASE=ubuntu24
- PROXYSQL_BUILD_TYPE=clickhouse

ubuntu24_clang_build:
extends:
service: ubuntu24_build
image: proxysql/packaging:build-clang-ubuntu24
environment:
- PKG_RELEASE=ubuntu24-clang

ubuntu24_dbg_build:
extends:
service: ubuntu24_build
environment:
- PKG_RELEASE=dbg-ubuntu24
- PROXYSQL_BUILD_TYPE=debug

####################################################################################################
####################################################################################################
opensuse15_build:
Expand Down
Loading