feat: use ubuntu lts (jammy 22.04)

thecodingmachine · Dec 7, 2022 · ceb9897 · ceb9897
1 parent bb381c3
commit ceb9897
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Dockerfile.slim.apache b/Dockerfile.slim.apache
@@ -1,6 +1,6 @@
 #syntax=docker/dockerfile-upstream:1
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
@@ -33,7 +33,7 @@ ENV PHP_VERSION=${PHP_VERSION}
 # Install php an other packages
 RUN apt-get update \
     && apt-get install -y --no-install-recommends gnupg \
-    && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu focal main" > /etc/apt/sources.list.d/ondrej-php.list \
+    && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ondrej-php.list \
     && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C \
     && apt-get update \
     && apt-get upgrade -y \

diff --git a/Dockerfile.slim.cli b/Dockerfile.slim.cli
@@ -1,6 +1,6 @@
 #syntax=docker/dockerfile-upstream:1
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
@@ -33,7 +33,7 @@ ENV PHP_VERSION=${PHP_VERSION}
 # Install php an other packages
 RUN apt-get update \
     && apt-get install -y --no-install-recommends gnupg \
-    && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu focal main" > /etc/apt/sources.list.d/ondrej-php.list \
+    && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ondrej-php.list \
     && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C \
     && apt-get update \
     && apt-get upgrade -y \

diff --git a/Dockerfile.slim.fpm b/Dockerfile.slim.fpm
@@ -1,6 +1,6 @@
 #syntax=docker/dockerfile-upstream:1
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
@@ -33,7 +33,7 @@ ENV PHP_VERSION=${PHP_VERSION}
 # Install php an other packages
 RUN apt-get update \
     && apt-get install -y --no-install-recommends gnupg \
-    && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu focal main" > /etc/apt/sources.list.d/ondrej-php.list \
+    && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ondrej-php.list \
     && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C \
     && apt-get update \
     && apt-get upgrade -y \

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ blueprint: ## Generate all blueprints file
 test-latest: test-8.1 ## Test the latest build only
 
 _test-prerequisites: blueprint
-	docker pull ubuntu:20.04
+	docker pull ubuntu:22.04
 
 test-quick:  ## Test 8.0 and 8.1 quickly
 	VERSION=8.0 VARIANT=cli $(MAKE) _test-version-quick

diff --git a/utils/Dockerfile.slim.blueprint b/utils/Dockerfile.slim.blueprint
@@ -1,5 +1,5 @@
 #syntax=docker/dockerfile-upstream:1
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
@@ -32,7 +32,7 @@ ENV PHP_VERSION=${PHP_VERSION}
 # Install php an other packages
 RUN apt-get update \
     && apt-get install -y --no-install-recommends gnupg \
-    && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu focal main" > /etc/apt/sources.list.d/ondrej-php.list \
+    && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ondrej-php.list \
     && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C \
     && apt-get update \
     && apt-get upgrade -y \