Back to centos 7 for now

Author: code-asher

scripts/centos.dockerfile

@@ -1,21 +1,20 @@
-FROM centos:6
+FROM centos:7
 
 RUN yum update -y \
-	&& yum install -y epel-release yum-utils centos-release-scl-rh \
-	&& yum-config-manager --enable rhel-server-rhscl-6-rpms \
+	&& yum install -y epel-release centos-release-scl \
+	&& yum-config-manager --enable rhel-server-rhscl-7-rpms \
 	&& yum update -y
 
 RUN yum install -y \
 		devtoolset-6 \
     gcc-c++ \
-    python27 \
     xz \
     ccache \
 		git
 
 RUN mkdir /root/node \
   && cd /root/node \
-  && curl https://nodejs.org/dist/v10.15.1/node-v10.15.1-linux-x64.tar.xz | tar xJ --strip-components=1 -- \
+  && curl https://nodejs.org/dist/v12.14.0/node-v12.14.0-linux-x64.tar.xz | tar xJ --strip-components=1 -- \
   && ln -s /root/node/bin/node /usr/bin/node
 
 ENV PATH "$PATH:/root/node/bin"

scripts/ci.bash

@@ -32,16 +32,8 @@ function docker-build() {
       docker-exec "cross-build-end"
       ;;
     *centos*)
-      # `__STDC_FORMAT_MACROS` is required on some older systems for access to
-      # some macros used by Node like `PRIx64`. In newer versions of Node this
-      # will already be set and we can remove it here.
-      local cpp_flags="-D __STDC_FORMAT_MACROS"
-
-      # `-lrt` provides clock_*; required for gcc < 2.17 (in 2.17 they became
-      # part of the main C library).
-      local ld_flags="-lrt"
-
-      docker-exec-build ". /opt/rh/devtoolset-6/enable && . /opt/rh/python27/enable && CPPFLAGS='$cpp_flags' LDFLAGS='$ld_flags'"
+      docker-exec-build ". /opt/rh/devtoolset-6/enable &&"
+      docker-exec "cd /src && npm rebuild" # So the native module works.
       ;;
     *)
       docker-exec-build