fix ubuntu base build

awslabs · Dec 19, 2024 · 27c1de6 · 27c1de6
1 parent 11aef91
commit 27c1de6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/.github/docker-images/base-images/device-client/ubuntu/Dockerfile b/.github/docker-images/base-images/device-client/ubuntu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04 AS base
+FROM ubuntu:22.04 AS base
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -17,6 +17,7 @@ RUN apt-get update -qq \
     libc6-dbg \
     softhsm \
     zlib1g-dev \
+    libssl-dev \
     && apt-get clean
 
 ###############################################################################
@@ -35,9 +36,9 @@ RUN wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \
 # Install pre-built CMake
 ###############################################################################
 WORKDIR /tmp
-RUN curl -sSL https://github.com/Kitware/CMake/releases/download/v3.10.0/cmake-3.10.0.tar.gz -o cmake-3.10.0.tar.gz \
-    && tar -zxvf cmake-3.10.0.tar.gz \
-    && cd cmake-3.10.0 \
+RUN curl -sSL https://github.com/Kitware/CMake/releases/download/v3.24.0/cmake-3.24.0.tar.gz -o cmake-3.24.0.tar.gz \
+    && tar -zxvf cmake-3.24.0.tar.gz \
+    && cd cmake-3.24.0 \
     && ./bootstrap \
     && make -j 2 \
     && make install

diff --git a/.github/workflows/e2e-ci.yml b/.github/workflows/e2e-ci.yml
@@ -48,7 +48,7 @@ jobs:
           context: .
           target: deploy
           build-args: |
-            OS=ubuntu:18.04
+            OS=ubuntu:22.04
             BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:x86_64-ubuntu-latest
           push: false
       - name: Get Version
@@ -87,7 +87,7 @@ jobs:
           file: .github/docker-images/Dockerfile
           context: .
           build-args: |
-            OS=ubuntu:18.04
+            OS=ubuntu:22.04
             BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:x86_64-ubuntu-latest
           push: true
           tags: |
@@ -125,7 +125,7 @@ jobs:
           file: .github/docker-images/Dockerfile
           context: .
           build-args: |
-            OS=ubuntu:18.04
+            OS=ubuntu:22.04
             BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:aarch64-ubuntu-latest
           push: true
           tags: |
@@ -165,7 +165,7 @@ jobs:
           file: .github/docker-images/Dockerfile
           context: .
           build-args: |
-            OS=ubuntu:18.04
+            OS=ubuntu:22.04
             BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:armv7-ubuntu-latest
           push: true
           tags: |
@@ -355,7 +355,7 @@ jobs:
           file: .github/docker-images/integration-tests/ubuntu/Dockerfile
           context: .
           build-args: |
-            OS=ubuntu:18.04
+            OS=ubuntu:22.04
             PRE_RELEASE_IMAGE=public.ecr.aws/${{ env.ECR_PRE_RELEASE_REPO }}:x86_64-ubuntu-${{ needs.versioning.outputs.version }}
             BASE_IMAGE=public.ecr.aws/${{ env.ECR_INTEG_BASE_REPO }}:x86_64-ubuntu-latest
           push: true
@@ -401,7 +401,7 @@ jobs:
           file: .github/docker-images/integration-tests/ubuntu/Dockerfile
           context: .
           build-args: |
-            OS=ubuntu:18.04
+            OS=ubuntu:22.04
             PRE_RELEASE_IMAGE=public.ecr.aws/${{ env.ECR_PRE_RELEASE_REPO }}:aarch64-ubuntu-${{ needs.versioning.outputs.version }}
             BASE_IMAGE=public.ecr.aws/${{ env.ECR_INTEG_BASE_REPO }}:aarch64-ubuntu-latest
           push: true
@@ -444,7 +444,7 @@ jobs:
           file: .github/docker-images/integration-tests/ubuntu/Dockerfile
           context: .
           build-args: |
-            OS=ubuntu:18.04
+            OS=ubuntu:22.04
             PRE_RELEASE_IMAGE=public.ecr.aws/${{ env.ECR_PRE_RELEASE_REPO }}:armv7-ubuntu-${{ needs.versioning.outputs.version }}
             BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:armv7-ubuntu-latest
           push: true

diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
@@ -41,7 +41,7 @@ jobs:
           context: .
           target: deploy
           build-args: |
-            OS=ubuntu:18.04
+            OS=ubuntu:22.04
             BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:x86_64-ubuntu-latest
           push: false
       - name: Get Version
@@ -83,7 +83,7 @@ jobs:
           file: .github/docker-images/Dockerfile
           context: .
           build-args: |
-            OS=ubuntu:18.04
+            OS=ubuntu:22.04
             BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:x86_64-ubuntu-latest
           push: true
           tags: |
@@ -124,7 +124,7 @@ jobs:
           file: .github/docker-images/Dockerfile
           context: .
           build-args: |
-            OS=ubuntu:18.04
+            OS=ubuntu:22.04
             BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:aarch64-ubuntu-latest
           push: true
           tags: |
@@ -165,7 +165,7 @@ jobs:
           file: .github/docker-images/Dockerfile
           context: .
           build-args: |
-            OS=ubuntu:18.04
+            OS=ubuntu:22.04
             BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:armv7-ubuntu-latest
           push: true
           tags: |