diff --git a/.github/workflows/image_build.yaml b/.github/workflows/image_build.yaml index e9d4c66..e1709b8 100644 --- a/.github/workflows/image_build.yaml +++ b/.github/workflows/image_build.yaml @@ -77,7 +77,7 @@ jobs: with: image: ${{ env.IMAGE_NAME }} tags: latest ${{ github.sha }} ${{ steps.cleaned_ref_name.outputs.ref_name }} - archs: amd64, arm64, arm64, s390x + archs: amd64, arm64, ppc64le, s390x layers: true # https://github.com/containers/buildah/issues/4777#issuecomment-1542088081 extra-args: | diff --git a/Dockerfile b/Dockerfile index 9a9a811..c8148bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,8 @@ RUN rpm -ivh epel-release-latest-9.noarch.rpm RUN dnf install -y 'dnf-command(config-manager)' RUN /usr/bin/crb enable -RUN curl -L https://copr.fedorainfracloud.org/coprs/kpvdr/opentelemetry-cpp/repo/epel-9/kpvdr-opentelemetry-cpp-epel-9.repo > /etc/yum.repos.d/kpvdr-opentelemetry-cpp-epel-9.repo +RUN curl -L https://copr.fedorainfracloud.org/coprs/kpvdr/opentelemetry-cpp-rhel/repo/epel-9/kpvdr-opentelemetry-cpp-rhel-epel-9.repo > /etc/yum.repos.d/kpvdr-opentelemetry-cpp-rhel-epel-9.repo +RUN curl -L https://copr.fedorainfracloud.org/coprs/kpvdr/protobuf/repo/epel-9/kpvdr-protobuf-epel-9.repo > /etc/yum.repos.d/kpvdr-protobuf-epel-9.repo RUN dnf -y --setopt=install_weak_deps=0 --setopt=tsflags=nodocs install \ ccache findutils git patchelf \ @@ -23,7 +24,6 @@ RUN dnf -y --setopt=install_weak_deps=0 --setopt=tsflags=nodocs install \ cmake ninja-build \ gcc gcc-c++ \ \ - opentelemetry-cpp-devel \ cyrus-sasl-devel \ openssl-devel \ python-devel @@ -36,8 +36,10 @@ WORKDIR /src ENV CCACHE_COMPRESS=true ENV CCACHE_MAXSIZE=400MB -RUN git clone --depth=1 https://github.com/apache/qpid-proton.git +# WORKAROUND: Use Proton 0.37.0 (without tracing) to get something compiling quickly +RUN git clone --branch=0.37.0 --depth=1 https://github.com/apache/qpid-proton.git RUN CCACHE_DIR=/ccache/$(arch) cmake -S qpid-proton -B cmake-build-qpid-proton -GNinja \ + -DENABLE_WARNING_ERROR=OFF \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_INSTALL_PREFIX=cmake-install \ @@ -72,7 +74,6 @@ RUN /usr/bin/crb enable RUN curl -L https://copr.fedorainfracloud.org/coprs/kpvdr/opentelemetry-cpp/repo/epel-9/kpvdr-opentelemetry-cpp-epel-9.repo > /etc/yum.repos.d/kpvdr-opentelemetry-cpp-epel-9.repo RUN dnf -y --setopt=install_weak_deps=0 --setopt=tsflags=nodocs install \ - opentelemetry-cpp \ cyrus-sasl cyrus-sasl-gssapi cyrus-sasl-lib cyrus-sasl-plain \ openssl