Skip to content

Commit d805589

Browse files
authored
update debian trixie (stable) (#6521)
1 parent 087d4ea commit d805589

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

lib/mix/tasks/phx.gen.release.ex

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,9 @@ defmodule Mix.Tasks.Phx.Gen.Release do
185185

186186
defp parse_args(args) do
187187
args
188-
|> OptionParser.parse(strict: [ecto: :boolean, docker: :boolean, elixir: :string, otp: :string])
188+
|> OptionParser.parse(
189+
strict: [ecto: :boolean, docker: :boolean, elixir: :string, otp: :string]
190+
)
189191
|> elem(0)
190192
|> Keyword.put_new_lazy(:ecto, &ecto_sql_installed?/0)
191193
|> Keyword.put_new_lazy(:socket_db_adaptor_installed, &socket_db_adaptor_installed?/0)
@@ -236,7 +238,7 @@ defmodule Mix.Tasks.Phx.Gen.Release do
236238
|> map_size() > 0
237239
end
238240

239-
@debian "bookworm"
241+
@debian "trixie"
240242
defp elixir_and_debian_vsn(elixir_vsn, otp_vsn) do
241243
url =
242244
"https://hub.docker.com/v2/namespaces/hexpm/repositories/elixir/tags?name=#{elixir_vsn}-erlang-#{otp_vsn}-debian-#{@debian}-"
@@ -254,13 +256,14 @@ defmodule Mix.Tasks.Phx.Gen.Release do
254256
end
255257

256258
defp gen_docker(binding, opts) do
257-
wanted_elixir_vsn = opts[:elixir] ||
258-
case Version.parse!(System.version()) do
259-
%{major: major, minor: minor, pre: ["dev"]} -> "#{major}.#{minor - 1}.0"
260-
_ -> System.version()
261-
end
259+
wanted_elixir_vsn =
260+
opts[:elixir] ||
261+
case Version.parse!(System.version()) do
262+
%{major: major, minor: minor, pre: ["dev"]} -> "#{major}.#{minor - 1}.0"
263+
_ -> System.version()
264+
end
262265

263-
otp_vsn = opts[:otp] || otp_vsn()
266+
otp_vsn = opts[:otp] || otp_vsn()
264267

265268
vsns =
266269
case elixir_and_debian_vsn(wanted_elixir_vsn, otp_vsn) do

priv/templates/phx.gen.release/Dockerfile.eex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ RUN mix release
7171
FROM ${RUNNER_IMAGE} AS final
7272

7373
RUN apt-get update \
74-
&& apt-get install -y --no-install-recommends libstdc++6 openssl libncurses5 locales ca-certificates \
74+
&& apt-get install -y --no-install-recommends libstdc++6 openssl libncurses6 locales ca-certificates \
7575
&& rm -rf /var/lib/apt/lists/*
7676

7777
# Set the locale

0 commit comments

Comments
 (0)