use based centos docker image

synechron-code · Mar 30, 2021 · b8bd9a8 · b8bd9a8
1 parent 925feee
commit b8bd9a8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,20 +1,22 @@
 # Setup build arguments with default versions
-ARG CENTOS_VERSION=latest
+ARG CENTOS_VERSION=7
 ARG GIT_VERSION=2.30.1-1.ep7
 ARG RHEL_ENDPOINT_VERSION=1.9-1
 ARG GCC_VERSION=4.8.5-44.el7
 ARG GLIBC_VERSION=2.17-323.el7_9
 
 # Download Terraform binary
-FROM centos/devtoolset-7-toolchain-centos7:${CENTOS_VERSION} as base
+#FROM centos/devtoolset-7-toolchain-centos7:${CENTOS_VERSION} as base
+FROM centos:${CENTOS_VERSION} as base
 ARG GIT_VERSION
 ARG RHEL_ENDPOINT_VERSION
 ARG GCC_VERSION
 ARG GLIBC_VERSION
 USER 0
-RUN yum -y install https://packages.endpoint.com/rhel/7/os/x86_64/endpoint-repo-${RHEL_ENDPOINT_VERSION}.x86_64.rpm \
-    && yum -y install git-${GIT_VERSION} \
-    && yum -y install libgcc-${GCC_VERSION} \
+RUN yum -y install https://packages.endpoint.com/rhel/7/os/x86_64/endpoint-repo-${RHEL_ENDPOINT_VERSION}.x86_64.rpm
+RUN yum -y install git-${GIT_VERSION}
+RUN yum -y group install "Development Tools"
+RUN yum -y install libgcc-${GCC_VERSION} \
     libgcc-c++-${GCC_VERSION}   \
     glibc-devel-${GLIBC_VERSION} \
     libstdc++-devel-${GCC_VERSION} \

diff --git a/tests/container-structure-tests.yml b/tests/container-structure-tests.yml
@@ -21,12 +21,12 @@ commandTests:
   - name: "Check GCC version"
     command: "gcc"
     args: ["--version"]
-    expectedOutput: ["Red Hat 7.3.1-5"]
+    expectedOutput: ["Red Hat 4.8.5-44"]
 
   - name: "Check G++ version"
     command: "g++"
     args: ["--version"]
-    expectedOutput: ["Red Hat 7.3.1-5"]
+    expectedOutput: ["Red Hat 4.8.5-44"]
 
 fileExistenceTests:
   - name: 'Check nonroot user home'