8000 [1.x] Use Ubuntu 24.04 and Node 22 (#758) · laravel/sail@466ef69 · GitHub
[go: up one dir, main page]
Skip to content

Commit 466ef69

Browse files
JubekiJubeki
authored
[1.x] Use Ubuntu 24.04 and Node 22 (#758)
* Use Ubuntu 24.04 * Don't bump base images for older php versions * Revert "Don't bump base images for older php versions" This reverts commit 4cd6113. * Apply suggestions
1 parent 07102e8 commit 466ef69

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed

‎runtimes/8.0/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:24.04
22

33
LABEL maintainer="Taylor Otwell"
44

55
ARG WWWGROUP
6-
ARG NODE_VERSION=20
6+
ARG NODE_VERSION=22
77
ARG POSTGRES_VERSION=17
88

99
WORKDIR /var/www/html
@@ -21,9 +21,9 @@ RUN echo "Acquire::http::Pipeline-Depth 0;" > /etc/apt/apt.conf.d/99custom && \
2121

2222
RUN apt-get update && apt-get upgrade -y \
2323
&& mkdir -p /etc/apt/keyrings \
24-
&& apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python2 dnsutils librsvg2-bin fswatch ffmpeg nano \
24+
&& apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python3 dnsutils librsvg2-bin fswatch ffmpeg nano \
2525
&& curl -sS 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c' | gpg --dearmor | tee /usr/share/keyrings/ppa_ondrej_php.gpg > /dev/null \
26-
&& echo "deb [signed-by=/usr/share/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu focal main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \
26+
&& echo "deb [signed-by=/usr/share/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu noble main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \
2727
&& apt-get update \
2828
&& apt-get install -y php8.0-cli php8.0-dev \
2929
php8.0-pgsql php8.0-sqlite3 php8.0-gd php8.0-imagick \
@@ -43,7 +43,7 @@ RUN apt-get update && apt-get upgrade -y \
4343
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarnkey.gpg >/dev/null \
4444
&& echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
4545
&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /usr/share/keyrings/pgdg.gpg >/dev/null \
46-
&& echo "deb [signed-by=/usr/share/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt focal-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
46+
&& echo "deb [signed-by=/usr/share/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt noble-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
4747
&& apt-get update \
4848
&& apt-get install -y yarn \
4949
&& apt-get install -y mysql-client \

‎runtimes/8.1/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
LABEL maintainer="Taylor Otwell"
44

55
ARG WWWGROUP
6-
ARG NODE_VERSION=20
6+
ARG NODE_VERSION=22
77
ARG POSTGRES_VERSION=17
88

99
WORKDIR /var/www/html
@@ -21,9 +21,9 @@ RUN echo "Acquire::http::Pipeline-Depth 0;" > /etc/apt/apt.conf.d/99custom && \
2121

2222
RUN apt-get update && apt-get upgrade -y \
2323
&& mkdir -p /etc/apt/keyrings \
24-
&& apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python2 dnsutils librsvg2-bin fswatch ffmpeg nano \
24+
&& apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python3 dnsutils librsvg2-bin fswatch ffmpeg nano \
2525
&& curl -sS 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c' | gpg --dearmor | tee /usr/share/keyrings/ppa_ondrej_php.gpg > /dev/null \
26-
&& echo "deb [signed-by=/usr/share/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \
26+
&& echo "deb [signed-by=/usr/share/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu noble main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \
2727
&& apt-get update \
2828
&& apt-get install -y php8.1-cli php8.1-dev \
2929
php8.1-pgsql php8.1-sqlite3 php8.1-gd php8.1-imagick \
@@ -44,7 +44,7 @@ RUN apt-get update && apt-get upgrade -y \
4444
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarn.gpg >/dev/null \
4545
&& echo "deb [signed-by=/usr/share/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
4646
&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /usr/share/keyrings/pgdg.gpg >/dev/null \
47-
&& echo "deb [signed-by=/usr/share/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt jammy-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
47+
&& echo "deb [signed-by=/usr/share/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt noble-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
4848
&& apt-get update \
4949
&& apt-get install -y yarn \
5050
&& apt-get install -y mysql-client \

‎runtimes/8.2/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
LABEL maintainer="Taylor Otwell"
44

55
ARG WWWGROUP
6-
ARG NODE_VERSION=20
6+
ARG NODE_VERSION=22
77
ARG POSTGRES_VERSION=17
88

99
WORKDIR /var/www/html
@@ -21,9 +21,9 @@ RUN echo "Acquire::http::Pipeline-Depth 0;" > /etc/apt/apt.conf.d/99custom && \
2121

2222
RUN apt-get update && apt-get upgrade -y \
2323
&& mkdir -p /etc/apt/keyrings \
24-
&& apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python2 dnsutils librsvg2-bin fswatch ffmpeg nano \
24+
&& apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python3 dnsutils librsvg2-bin fswatch ffmpeg nano \
2525
&& curl -sS 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c' | gpg --dearmor | tee /etc/apt/keyrings/ppa_ondrej_php.gpg > /dev/null \
26-
&& echo "deb [signed-by=/etc/apt/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \
26+
&& echo "deb [signed-by=/etc/apt/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu noble main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \
2727
&& apt-get update \
2828
&& apt-get install -y php8.2-cli php8.2-dev \
2929
php8.2-pgsql php8.2-sqlite3 php8.2-gd php8.2-imagick \
@@ -45,7 +45,7 @@ RUN apt-get update && apt-get upgrade -y \
4545
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /etc/apt/keyrings/yarn.gpg >/dev/null \
4646
&& echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
4747
&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/keyrings/pgdg.gpg >/dev/null \
48-
&& echo "deb [signed-by=/etc/apt/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt jammy-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
48+
&& echo "deb [signed-by=/etc/apt/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt noble-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
4949
&& apt-get update \
5050
&& apt-get install -y yarn \
5151
&& apt-get install -y mysql-client \

‎runtimes/8.3/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
LABEL maintainer="Taylor Otwell"
44

55
ARG WWWGROUP
6-
ARG NODE_VERSION=20
6+
ARG NODE_VERSION=22
77
ARG MYSQL_CLIENT="mysql-client"
88
ARG POSTGRES_VERSION=17
99

@@ -22,9 +22,9 @@ RUN echo "Acquire::http::Pipeline-Depth 0;" > /etc/apt/apt.conf.d/99custom && \
2222

2323
RUN apt-get update && apt-get upgrade -y \
2424
&& mkdir -p /etc/apt/keyrings \
25-
&& apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python2 dnsutils librsvg2-bin fswatch ffmpeg nano \
25+
&& apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python3 dnsutils librsvg2-bin fswatch ffmpeg nano \
2626
&& curl -sS 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c' | gpg --dearmor | tee /etc/apt/keyrings/ppa_ondrej_php.gpg > /dev/null \
27-
&& echo "deb [signed-by=/etc/apt/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \
27+
&& echo "deb [signed-by=/etc/apt/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu noble main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \
2828
&& apt-get update \
2929
&& apt-get install -y php8.3-cli php8.3-dev \
3030
php8.3-pgsql php8.3-sqlite3 php8.3-gd \
@@ -46,7 +46,7 @@ RUN apt-get update && apt-get upgrade -y \
4646
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /etc/apt/keyrings/yarn.gpg >/dev/null \
4747
&& echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
4848
&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/keyrings/pgdg.gpg >/dev/null \
49-
&& echo "deb [signed-by=/etc/apt/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt jammy-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
49+
&& echo "deb [signed-by=/etc/apt/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt noble-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
5050
&& apt-get update \
5151
&& apt-get install -y yarn \
5252
&& apt-get install -y $MYSQL_CLIENT \

‎runtimes/8.4/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
LABEL maintainer="Taylor Otwell"
44

55
ARG WWWGROUP
6-
ARG NODE_VERSION=20
6+
ARG NODE_VERSION=22
77
ARG MYSQL_CLIENT="mysql-client"
88
ARG POSTGRES_VERSION=17
99

@@ -22,9 +22,9 @@ RUN echo "Acquire::http::Pipeline-Depth 0;" > /etc/apt/apt.conf.d/99custom && \
2222

2323
RUN apt-get update && apt-get upgrade -y \
2424
&& mkdir -p /etc/apt/keyrings \
25-
&& apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python2 dnsutils librsvg2-bin fswatch ffmpeg nano \
25+
&& apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python3 dnsutils librsvg2-bin fswatch ffmpeg nano \
2626
&& curl -sS 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c' | gpg --dearmor | tee /etc/apt/keyrings/ppa_ondrej_php.gpg > /dev/null \
27-
&& echo "deb [signed-by=/etc/apt/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \
27+
&& echo "deb [signed-by=/etc/apt/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu noble main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \
2828
&& apt-get update \
2929
&& apt-get install -y php8.4-cli php8.4-dev \
3030
php8.4-pgsql php8.4-sqlite3 php8.4-gd \
@@ -47,7 +47,7 @@ RUN apt-get update && apt-get upgrade -y \
4747
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /etc/apt/keyrings/yarn.gpg >/dev/null \
4848
&& echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
4949
&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/keyrings/pgdg.gpg >/dev/null \
50-
&& echo "deb [signed-by=/etc/apt/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt jammy-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
50+
&& echo "deb [signed-by=/etc/apt/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt noble-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
5151
&& apt-get update \
5252
&& apt-get install -y yarn \
5353
&& apt-get install -y $MYSQL_CLIENT \

0 commit comments

Comments
 (0)
0