Change Docker image Ubuntu version to 21.10 (#448)

* Use Ubuntu 21.10 image * remove hadolint. Update curl, iputils and netutils * circleci remote docker version * Removing ShiftLeftScan github action as it is broken Co-authored-by: Jason Frame <[email protected]>
Consensys · Mar 30, 2022 · 71c85b4 · 71c85b4
1 parent 62bacdf
commit 71c85b4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 67 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,7 +7,7 @@ orbs:
 executors:
   executor_med:  # 2cpu, 4G ram
     docker:
-      - image: cimg/openjdk:11.0.13
+      - image: cimg/openjdk:11.0
         auth:
           username: $DOCKER_USER_RO
           password: $DOCKER_PASSWORD_RO             
@@ -19,7 +19,7 @@ executors:
 
   executor_large: # 4cpu, 8G ram
     docker:
-      - image: cimg/openjdk:11.0.13
+      - image: cimg/openjdk:11.0
         auth:
           username: $DOCKER_USER_RO
           password: $DOCKER_PASSWORD_RO     
@@ -29,15 +29,6 @@ executors:
       JAVA_TOOL_OPTIONS: -Xmx4096m
       GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=4 -Xmx4096m
 
-  executor_machine: # 2cpu , 8G ram
-    machine:
-      image: ubuntu-2004:202008-01 #Ubuntu 20.04, docker 19.03, docker-compose 1.27.4
-      docker_layer_caching: true
-    working_directory: ~/project
-    environment:
-      JAVA_TOOL_OPTIONS: -Xmx4096m
-      GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=2 -Xmx4096m
-
 commands:
   prepare:
     description: "Prepare"
@@ -144,13 +135,10 @@ jobs:
     executor: executor_med
     steps:
       - prepare
-      - setup_remote_docker
+      - setup_remote_docker:
+          version: 20.10.11
       - attach_workspace:
           at: ~/project
-      - run:
-          name: hadoLint
-          command: |
-            docker run --rm -i hadolint/hadolint < docker/Dockerfile
       - run:
           name: build image
           command: |

diff --git a/.github/workflows/shiftleft-analysis.yml b/.github/workflows/shiftleft-analysis.yml
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -9,13 +9,13 @@ RUN JAVA_TOOL_OPTIONS="-Djdk.lang.Process.launchMechanism=vfork" "$JAVA_HOME/bin
          --compress=2 \
          --output /javaruntime
 
-FROM ubuntu:20.04
+FROM ubuntu:21.10
 ENV JAVA_HOME=/opt/java/openjdk
 ENV PATH "${JAVA_HOME}/bin:${PATH}"
 COPY --from=jre-build /javaruntime $JAVA_HOME
 
-RUN apt-get update && apt-get install -y --no-install-recommends curl=7.68\.* netcat=1.2* \
- && apt-get clean \
+RUN apt update && apt install -y --no-install-recommends curl iputils-ping net-tools \
+ && apt clean \
  && rm -rf /var/lib/apt/lists/*
 
 # Add ethsigner user instead of using root (may bring backward incompatibility for previous directory mounts)
@@ -47,4 +47,4 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.vcs-url="https://github.com/ConsenSys/ethsigner" \
       org.label-schema.vendor="Consensys" \
       org.label-schema.version=$VERSION \
-      org.label-schema.schema-version="1.0"
+      org.label-schema.schema-version="1.0"