Skip to content

Commit ceb9897

Browse files
committed
feat: use ubuntu lts (jammy 22.04)
1 parent bb381c3 commit ceb9897

5 files changed

+9
-9
lines changed

Dockerfile.slim.apache

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#syntax=docker/dockerfile-upstream:1
22
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
3-
FROM ubuntu:20.04
3+
FROM ubuntu:22.04
44
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
55
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
66

@@ -33,7 +33,7 @@ ENV PHP_VERSION=${PHP_VERSION}
3333
# Install php an other packages
3434
RUN apt-get update \
3535
&& apt-get install -y --no-install-recommends gnupg \
36-
&& echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu focal main" > /etc/apt/sources.list.d/ondrej-php.list \
36+
&& echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ondrej-php.list \
3737
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C \
3838
&& apt-get update \
3939
&& apt-get upgrade -y \

Dockerfile.slim.cli

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#syntax=docker/dockerfile-upstream:1
22
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
3-
FROM ubuntu:20.04
3+
FROM ubuntu:22.04
44
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
55
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
66

@@ -33,7 +33,7 @@ ENV PHP_VERSION=${PHP_VERSION}
3333
# Install php an other packages
3434
RUN apt-get update \
3535
&& apt-get install -y --no-install-recommends gnupg \
36-
&& echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu focal main" > /etc/apt/sources.list.d/ondrej-php.list \
36+
&& echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ondrej-php.list \
3737
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C \
3838
&& apt-get update \
3939
&& apt-get upgrade -y \

Dockerfile.slim.fpm

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#syntax=docker/dockerfile-upstream:1
22
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
3-
FROM ubuntu:20.04
3+
FROM ubuntu:22.04
44
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
55
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
66

@@ -33,7 +33,7 @@ ENV PHP_VERSION=${PHP_VERSION}
3333
# Install php an other packages
3434
RUN apt-get update \
3535
&& apt-get install -y --no-install-recommends gnupg \
36-
&& echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu focal main" > /etc/apt/sources.list.d/ondrej-php.list \
36+
&& echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ondrej-php.list \
3737
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C \
3838
&& apt-get update \
3939
&& apt-get upgrade -y \

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ blueprint: ## Generate all blueprints file
77
test-latest: test-8.1 ## Test the latest build only
88

99
_test-prerequisites: blueprint
10-
docker pull ubuntu:20.04
10+
docker pull ubuntu:22.04
1111

1212
test-quick: ## Test 8.0 and 8.1 quickly
1313
VERSION=8.0 VARIANT=cli $(MAKE) _test-version-quick

utils/Dockerfile.slim.blueprint

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#syntax=docker/dockerfile-upstream:1
2-
FROM ubuntu:20.04
2+
FROM ubuntu:22.04
33
LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
44
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
55

@@ -32,7 +32,7 @@ ENV PHP_VERSION=${PHP_VERSION}
3232
# Install php an other packages
3333
RUN apt-get update \
3434
&& apt-get install -y --no-install-recommends gnupg \
35-
&& echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu focal main" > /etc/apt/sources.list.d/ondrej-php.list \
35+
&& echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ondrej-php.list \
3636
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C \
3737
&& apt-get update \
3838
&& apt-get upgrade -y \

0 commit comments

Comments
 (0)