build: Use devtoolset-10 instead

getsentry · May 23, 2022 · dcb4362 · dcb4362
1 parent 26cc7c5
commit dcb4362
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -15,10 +15,8 @@ ENV BUILD_ARCH=${BUILD_ARCH}
 ENV BUILD_TARGET=${BUILD_ARCH}-unknown-linux-gnu
 
 RUN yum -y update \
-    && yum -y install epel-release \
-    && yum -y install cmake3 curl gcc gcc-c++ git make zip \
-    # below required for sentry-native
-    clang libcurl-devel \
+    && yum -y install centos-release-scl epel-release \
+    && yum -y install cmake3 devtoolset-10 git \
     && yum clean all \
     && rm -rf /var/cache/yum \
     && ln -s /usr/bin/cmake3 /usr/bin/cmake
@@ -44,8 +42,11 @@ ENV RELAY_FEATURES=${RELAY_FEATURES}
 COPY --from=sentry-cli /bin/sentry-cli /bin/sentry-cli
 COPY . .
 
-# BUILD IT!
-RUN make build-linux-release TARGET=${BUILD_TARGET} RELAY_FEATURES=${RELAY_FEATURES}
+# Build with the modern compiler toolchain enabled
+RUN scl enable devtoolset-10 -- \
+    make build-linux-release \
+    TARGET=${BUILD_TARGET} \
+    RELAY_FEATURES=${RELAY_FEATURES}
 
 RUN cp ./target/$BUILD_TARGET/release/relay /bin/relay \
     && zip /opt/relay-debug.zip target/$BUILD_TARGET/release/relay.debug