Update Docker to 22.04

ARM-software · Jun 19, 2023 · 2372d4c · 2372d4c
1 parent 6157a41
commit 2372d4c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/jenkins/build-image.sh b/jenkins/build-image.sh
@@ -2,7 +2,7 @@
 ARTIFACTORY_URL=eu-west-1.artifactory.aws.arm.com
 DOCKER_REGISTRY=mobile-studio--docker.${ARTIFACTORY_URL}
 IMAGE_NAME=astcenc
-IMAGE_VERSION=3.1.0
+IMAGE_VERSION=3.2.0
 
 # Check Artifactory credentials are set
 if [[ -z "${ARTIFACTORY_CREDENTIALS}" ]]

diff --git a/jenkins/build.Dockerfile b/jenkins/build.Dockerfile
@@ -1,15 +1,15 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 RUN useradd -u 1000 -U -m -c Jenkins jenkins
 
 RUN apt update && apt -y upgrade \
  && apt install -y \
  software-properties-common \
  clang \
- clang++-9 \
  gcc \
  g++ \
  git \
+ cmake \
  imagemagick \
  make \
  python3 \
@@ -31,10 +31,3 @@ RUN chmod 555 /tmp/coverity_install.sh && \
  /tmp/coverity_install.sh -q --license.region=6 --license.agreement=agree --license.cov.path=/tmp/coverity_license.dat -dir /usr/local/cov-analysis && \
  rm /tmp/coverity_*
 ENV PATH="/usr/local/cov-analysis/bin:$PATH"
-
-# Install up-to-date CMake, as standard Ubuntu 18.04 package is too old
-RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null \
- | gpg --dearmor - > /etc/apt/trusted.gpg.d/kitware.gpg
-RUN apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main'
-RUN apt-get update
-RUN apt-get install -y cmake
diff --git a/jenkins/nightly.Jenkinsfile b/jenkins/nightly.Jenkinsfile
@@ -41,7 +41,7 @@ pipeline {
  - name: artifactory-ms-docker
  containers:
  - name: astcenc
- image: mobile-studio--docker.eu-west-1.artifactory.aws.arm.com/astcenc:3.1.0
+ image: mobile-studio--docker.eu-west-1.artifactory.aws.arm.com/astcenc:3.2.0
  command:
  - sleep
  args:

diff --git a/jenkins/release.Jenkinsfile b/jenkins/release.Jenkinsfile
@@ -43,7 +43,7 @@ spec:
  - name: artifactory-ms-docker
  containers:
  - name: astcenc
- image: mobile-studio--docker.eu-west-1.artifactory.aws.arm.com/astcenc:3.1.0
+ image: mobile-studio--docker.eu-west-1.artifactory.aws.arm.com/astcenc:3.2.0
  command:
  - sleep
  args: