From bfa1b9b03aa2119cc5e0308053369fbab40ccd9b Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Wed, 5 Jan 2022 08:55:55 +0000 Subject: [PATCH] use centos6.7v2 image --- docker-compose.yml | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 646dba853..717052673 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "2.0" services: centos67_build: - image: proxysql/packaging:build-centos6.7 + image: proxysql/packaging:build-centos6.7v2 volumes: - ./docker/images/proxysql/rhel-compliant/rpmmacros/:/root/ - ./docker/images/proxysql/rhel-compliant/rhel6/entrypoint/:/opt/entrypoint/ @@ -16,7 +16,7 @@ services: command: - /opt/entrypoint/entrypoint.bash centos67_dbg_build: - image: proxysql/packaging:build-centos6.7 + image: proxysql/packaging:build-centos6.7v2 volumes: - ./docker/images/proxysql/rhel-compliant/rpmmacros/:/root/ - ./docker/images/proxysql/rhel-compliant/rhel6/entrypoint/:/opt/entrypoint/ @@ -241,6 +241,38 @@ services: - PROXYSQL_BUILD_ARCH=x86_64 command: - /opt/entrypoint/entrypoint.bash + + fedora34_build: + image: proxysql/packaging:build-fedora34 + volumes: + - ./docker/images/proxysql/rhel-compliant/rpmmacros/:/root/ + - ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/ + - ./:/opt/proxysql/ + environment: + - MAKE + - MAKEOPT + - CURVER + - PKG_RELEASE=fedora34 + - PROXYSQL_BUILD_TYPE=clickhouse + - PROXYSQL_BUILD_ARCH=x86_64 + command: + - /opt/entrypoint/entrypoint.bash + fedora34_dbg_build: + image: proxysql/packaging:build-fedora34 + volumes: + - ./docker/images/proxysql/rhel-compliant/rpmmacros/:/root/ + - ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/ + - ./:/opt/proxysql/ + environment: + - MAKE + - MAKEOPT + - CURVER + - PKG_RELEASE=dbg-fedora34 + - PROXYSQL_BUILD_TYPE=debug + - PROXYSQL_BUILD_ARCH=x86_64 + command: + - /opt/entrypoint/entrypoint.bash + fedora32_arm64_build: image: proxysql/packaging-arm64:build-fedora32 volumes: