Merge pull request #105 from privacysandbox/release-0.72.0

Release 0.72.0
privacysandbox · Oct 23, 2024 · 1f1f1ea · 1f1f1ea
2 parents c631816 + 49eff37
commit 1f1f1ea
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## 0.72.0 (2024-10-23)
+
+
+### Features
+
+* Update build-debian image to Ubuntu 22.04 LTS
+
 ## 0.71.0 (2024-10-18)
 
 

diff --git a/images/build-debian/Dockerfile b/images/build-debian/Dockerfile
@@ -13,16 +13,16 @@
 # limitations under the License.
 
 # Use fixed manifest digest to ensure reproducible.
-# https://hub.docker.com/layers/library/ubuntu/focal-20240530/images/sha256-85c08a37b74bc18a7b3f8cf89aabdfac51c525cdbc193a753f7907965e310ec2
-# ubuntu v20.04, focal-20240530
-ARG BASE_IMAGE=ubuntu@sha256:fa17826afb526a9fc7250e0fbcbfd18d03fe7a54849472f86879d8bf562c629e
+# https://hub.docker.com/layers/library/ubuntu/jammy-20240911.1/images/sha256-3d1556a8a18cf5307b121e0a98e93f1ddf1f3f8e092f1fddfd941254785b95d7?context=explore
+# ubuntu v22.04, jammy-20240911.1
+ARG BASE_IMAGE=ubuntu@sha256:58b87898e82351c6cf9cf5b9f3c20257bb9e2dcf33af051e12ce532d7f94e3fe
 
 # ignore this hadolint error as BASE_IMAGE contains an image tag
 # hadolint ignore=DL3006
 FROM ${BASE_IMAGE} as libprofiler-builder
 ENV CC=clang \
     CXX=clang++
-ADD https://github.com/gperftools/gperftools/releases/download/gperftools-2.13/gperftools-2.13.tar.gz /build/gperftools.tar.gz
+ADD https://github.com/gperftools/gperftools/releases/download/gperftools-2.16/gperftools-2.16.tar.gz /build/gperftools.tar.gz
 ADD https://apt.llvm.org/llvm.sh /build/llvm.sh
 COPY compile_libprofiler /scripts/
 RUN /scripts/compile_libprofiler

diff --git a/images/build-debian/compile_libprofiler b/images/build-debian/compile_libprofiler
@@ -3,7 +3,7 @@
 set -o pipefail
 set -o errexit
 
-declare -r -i CLANG_VER=15
+declare -r -i CLANG_VER=18
 
 function apt_update() {
   apt-get --quiet -o 'Acquire::https::No-Cache=True' -o 'Acquire::http::No-Cache=True' update
@@ -15,7 +15,7 @@ function install_build_tools() {
     lsb-release="11.1.*" \
     make="4.*" \
     software-properties-common="0.99.*" \
-    wget="1.20.*"
+    wget="1.21.*"
 }
 
 function install_clang() {
@@ -35,7 +35,7 @@ function install_profiler() {
   tar xz --strip-components 1 -f gperftools.tar.gz
   ./configure
   make libprofiler.la
-  declare -r ver=0.5.9
+  declare -r ver=0.5.13
   cp .libs/libprofiler.so.${ver} /usr/lib
   ls -l /usr/lib/libprofiler*
 }

diff --git a/images/build-debian/install_apps b/images/build-debian/install_apps
@@ -5,7 +5,7 @@ set -o errexit
 
 declare -i VERBOSE=0
 declare INSTALL_LOCALE=en_US.UTF-8
-declare -r -i CLANG_VER=15
+declare -r -i CLANG_VER=18
 
 usage() {
   local exitval=${1-1}
@@ -44,47 +44,41 @@ function apt_update() {
 }
 
 function install_python() {
+  local -r ver="3.10"
   apt-get --quiet install -y --no-install-recommends \
-    python3.9-venv="3.9.*" python3.9-dev
+    python${ver}-venv="${ver}.*" python${ver}-dev python3-clang python3-numpy
   mkdir -p /opt/bin
   update-alternatives \
     --force \
-    --install /opt/bin/python3 python3-opt /usr/bin/python3.9 100 \
-    --slave /usr/bin/python3 python3-usr /usr/bin/python3.9 \
-    --slave /usr/bin/python python-usr /usr/bin/python3.9 \
-    --slave /opt/bin/python python /usr/bin/python3.9
-  curl https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py
-  /usr/bin/python3 /tmp/get-pip.py
-  rm -f /tmp/get-pip.py
-  /usr/bin/python3 -m pip --version
-  /usr/bin/python3 -m pip install \
-    "libclang~=${CLANG_VER}.0" \
-    "numpy~=1.25"
+    --install /opt/bin/python3 python3-opt /usr/bin/python${ver} 100 \
+    --slave /usr/bin/python3 python3-usr /usr/bin/python${ver} \
+    --slave /usr/bin/python python-usr /usr/bin/python${ver} \
+    --slave /opt/bin/python python /usr/bin/python${ver}
 }
 
 function install_misc() {
   apt-get --quiet install -y --no-install-recommends \
-    apt-transport-https="2.0.*" \
+    apt-transport-https="2.4.*" \
     bsdmainutils \
     ca-certificates \
     chrpath="0.16-*" \
-    curl="7.68.*" \
+    curl="7.81.*" \
     file="1:5.*" \
     gawk="1:5.*" \
-    gettext="0.19.*" \
-    git="1:2.25.*" \
+    gettext="0.21*" \
+    git="1:2.34.*" \
     gnupg="2.2.*" \
     google-perftools="2.*" \
     jq="1.6-*" \
-    libcurl4="7.68.*" \
-    locales="2.31-*" \
+    libcurl4="7.81.*" \
+    locales="2.35-*" \
     lsb-release="11.1.*" \
-    openssh-client="1:8.2*" \
+    openssh-client="1:8.9*" \
     patch="2.7.*" \
-    rename="1.10-*" \
+    rename="1.30-*" \
     software-properties-common="0.99.*" \
     unzip="6.0-*" \
-    wget="1.20.*" \
+    wget="1.21.*" \
     xz-utils="5.2.*" \
     zip="3.0-*"
 

diff --git a/tests/data/hashes/build-debian b/tests/data/hashes/build-debian
@@ -1 +1 @@
-877727ca542620501a2822cc32424fe5387cc37f09012a08a8cfdc86881c39a5
+1a595986739d80813edc0eb5736834589a1d39aaa28dcd18eb7c37484f27e3bb
diff --git a/tools/get-architecture b/tools/get-architecture
@@ -27,5 +27,5 @@ function _cleanup() {
 if [[ -n ${BUILD_ARCH} ]]; then
   printf "%s\n" "${BUILD_ARCH}"
 else
-  docker run --rm --entrypoint=/usr/bin/dpkg ubuntu:20.04 --print-architecture
+  docker run --rm --entrypoint=/usr/bin/dpkg ubuntu:22.04 --print-architecture
 fi
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.71.0
+0.72.0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		877727ca542620501a2822cc32424fe5387cc37f09012a08a8cfdc86881c39a5
		1a595986739d80813edc0eb5736834589a1d39aaa28dcd18eb7c37484f27e3bb