From 927946c4f57577ae598841c29e2e3a52dc6be791 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Fri, 17 Feb 2023 10:38:52 +0100
Subject: [PATCH] Move ubuntu 22.04 dependencies to docker image

---
 .circleci/config.yml                                | 11 -----------
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 872b548f2..ad5427f40 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1104,11 +1104,6 @@ jobs:
       - checkout
       - attach_workspace:
           at: build
-      - run:
-          name: Install all locales
-          command: |
-            apt update --assume-yes
-            apt install locales-all --assume-yes --no-install-recommends
       - run: test/localeTest.sh build/solc/solc
       - matrix_notify_failure_unless_pr
 
@@ -1516,12 +1511,6 @@ jobs:
           name: Print diff
           when: on_fail
           command: diff --unified=0 --report-identical-files --from-file $REPORT_FILES | head --lines 50
-      - run:
-          name: Install zip
-          when: on_fail
-          command: |
-            apt update --quiet
-            apt install zip --assume-yes
       - run:
           name: Bundle reports into a single package
           when: on_fail
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
index 51ab30ac0..e45342c58 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
@@ -38,7 +38,7 @@ RUN set -ex; \
 		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
 		libboost-program-options-dev \
 		libcvc4-dev libz3-static-dev z3-static jq \
-		libcln-dev; \
+		libcln-dev zip locales-all; \
 	apt-get install -qy python3-pip python3-sphinx; \
 	pip3 install codecov; \
 	rm -rf /var/lib/apt/lists/*