Skip to content

Commit 27c1de6

Browse files
committed
fix ubuntu base build
1 parent 11aef91 commit 27c1de6

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

.github/docker-images/base-images/device-client/ubuntu/Dockerfile

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04 AS base
1+
FROM ubuntu:22.04 AS base
22

33
ENV DEBIAN_FRONTEND=noninteractive
44

@@ -17,6 +17,7 @@ RUN apt-get update -qq \
1717
libc6-dbg \
1818
softhsm \
1919
zlib1g-dev \
20+
libssl-dev \
2021
&& apt-get clean
2122

2223
###############################################################################
@@ -35,9 +36,9 @@ RUN wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \
3536
# Install pre-built CMake
3637
###############################################################################
3738
WORKDIR /tmp
38-
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 \
39-
&& tar -zxvf cmake-3.10.0.tar.gz \
40-
&& cd cmake-3.10.0 \
39+
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 \
40+
&& tar -zxvf cmake-3.24.0.tar.gz \
41+
&& cd cmake-3.24.0 \
4142
&& ./bootstrap \
4243
&& make -j 2 \
4344
&& make install

.github/workflows/e2e-ci.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
context: .
4949
target: deploy
5050
build-args: |
51-
OS=ubuntu:18.04
51+
OS=ubuntu:22.04
5252
BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:x86_64-ubuntu-latest
5353
push: false
5454
- name: Get Version
@@ -87,7 +87,7 @@ jobs:
8787
file: .github/docker-images/Dockerfile
8888
context: .
8989
build-args: |
90-
OS=ubuntu:18.04
90+
OS=ubuntu:22.04
9191
BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:x86_64-ubuntu-latest
9292
push: true
9393
tags: |
@@ -125,7 +125,7 @@ jobs:
125125
file: .github/docker-images/Dockerfile
126126
context: .
127127
build-args: |
128-
OS=ubuntu:18.04
128+
OS=ubuntu:22.04
129129
BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:aarch64-ubuntu-latest
130130
push: true
131131
tags: |
@@ -165,7 +165,7 @@ jobs:
165165
file: .github/docker-images/Dockerfile
166166
context: .
167167
build-args: |
168-
OS=ubuntu:18.04
168+
OS=ubuntu:22.04
169169
BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:armv7-ubuntu-latest
170170
push: true
171171
tags: |
@@ -355,7 +355,7 @@ jobs:
355355
file: .github/docker-images/integration-tests/ubuntu/Dockerfile
356356
context: .
357357
build-args: |
358-
OS=ubuntu:18.04
358+
OS=ubuntu:22.04
359359
PRE_RELEASE_IMAGE=public.ecr.aws/${{ env.ECR_PRE_RELEASE_REPO }}:x86_64-ubuntu-${{ needs.versioning.outputs.version }}
360360
BASE_IMAGE=public.ecr.aws/${{ env.ECR_INTEG_BASE_REPO }}:x86_64-ubuntu-latest
361361
push: true
@@ -401,7 +401,7 @@ jobs:
401401
file: .github/docker-images/integration-tests/ubuntu/Dockerfile
402402
context: .
403403
build-args: |
404-
OS=ubuntu:18.04
404+
OS=ubuntu:22.04
405405
PRE_RELEASE_IMAGE=public.ecr.aws/${{ env.ECR_PRE_RELEASE_REPO }}:aarch64-ubuntu-${{ needs.versioning.outputs.version }}
406406
BASE_IMAGE=public.ecr.aws/${{ env.ECR_INTEG_BASE_REPO }}:aarch64-ubuntu-latest
407407
push: true
@@ -444,7 +444,7 @@ jobs:
444444
file: .github/docker-images/integration-tests/ubuntu/Dockerfile
445445
context: .
446446
build-args: |
447-
OS=ubuntu:18.04
447+
OS=ubuntu:22.04
448448
PRE_RELEASE_IMAGE=public.ecr.aws/${{ env.ECR_PRE_RELEASE_REPO }}:armv7-ubuntu-${{ needs.versioning.outputs.version }}
449449
BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:armv7-ubuntu-latest
450450
push: true

.github/workflows/release-ci.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
context: .
4242
target: deploy
4343
build-args: |
44-
OS=ubuntu:18.04
44+
OS=ubuntu:22.04
4545
BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:x86_64-ubuntu-latest
4646
push: false
4747
- name: Get Version
@@ -83,7 +83,7 @@ jobs:
8383
file: .github/docker-images/Dockerfile
8484
context: .
8585
build-args: |
86-
OS=ubuntu:18.04
86+
OS=ubuntu:22.04
8787
BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:x86_64-ubuntu-latest
8888
push: true
8989
tags: |
@@ -124,7 +124,7 @@ jobs:
124124
file: .github/docker-images/Dockerfile
125125
context: .
126126
build-args: |
127-
OS=ubuntu:18.04
127+
OS=ubuntu:22.04
128128
BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:aarch64-ubuntu-latest
129129
push: true
130130
tags: |
@@ -165,7 +165,7 @@ jobs:
165165
file: .github/docker-images/Dockerfile
166166
context: .
167167
build-args: |
168-
OS=ubuntu:18.04
168+
OS=ubuntu:22.04
169169
BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:armv7-ubuntu-latest
170170
push: true
171171
tags: |

0 commit comments

Comments
 (0)