(Supercedes #950) Bump elixir (#953)

* Bump elixir to 1.14.0

* gen_env -> compile_env

* Update Dockerfiles

* Update software
This commit is contained in:
Jamil
2022-09-12 14:40:16 -07:00
committed by GitHub
parent 13a48cce1b
commit 7861977379
9 changed files with 15 additions and 15 deletions

View File

@@ -13,12 +13,12 @@ services:
dockerfile: Dockerfile
args:
# Elixir Version: 1.9, 1.10, 1.10.4, ...
VARIANT: "1.13.4"
VARIANT: "1.14.0"
# Phoenix Version: 1.4.17, 1.5.4, ...
PHOENIX_VERSION: "1.6.2"
PHOENIX_VERSION: "1.6.12"
# Node Version: 12, 14, ...
NODE_VERSION: "14"
RUBY_VERSION: "2.7.5"
NODE_VERSION: "16"
RUBY_VERSION: "2.7.6"
volumes:
- ..:/workspace:cached
@@ -32,7 +32,7 @@ services:
command: sleep infinity
postgres:
image: postgres:13.5
image: postgres:13
restart: unless-stopped
volumes:
- postgres-data:/var/lib/postgresql/data

View File

@@ -23,7 +23,7 @@ jobs:
- uses: erlef/setup-beam@v1
with:
otp-version: '25'
elixir-version: '1.13'
elixir-version: '1.14'
- uses: actions/cache@v2
name: Setup Elixir cache
with:
@@ -115,7 +115,7 @@ jobs:
- uses: erlef/setup-beam@v1
with:
otp-version: '25'
elixir-version: '1.13'
elixir-version: '1.14'
- uses: actions/cache@v2
with:
path: |

View File

@@ -1,7 +1,7 @@
# These are used for the dev environment.
# This should match the versions used in the built product.
nodejs 16.17.0
elixir 1.13.4-otp-25
elixir 1.14.0-otp-25
erlang 25.0.4
# Used for static analysis

View File

@@ -1,6 +1,6 @@
# This Dockerfile builds a development image to use for local development work
FROM hexpm/elixir:1.13.4-erlang-25.0.4-ubuntu-jammy-20220428
FROM hexpm/elixir:1.14.0-erlang-25.0.4-ubuntu-jammy-20220428
RUN set -xe \
&& apt-get update \

View File

@@ -1,4 +1,4 @@
ARG ELIXIR_VERSION=1.13.4
ARG ELIXIR_VERSION=1.14.0
ARG OTP_VERSION=25.0.4
ARG ALPINE_VERSION=3.16.1

View File

@@ -4,7 +4,7 @@ defmodule FzHttpWeb.Endpoint do
alias FzHttpWeb.HeaderHelpers
alias FzHttpWeb.Session
if Application.get_env(:fz_http, :sql_sandbox) do
if Application.compile_env(:fz_http, :sql_sandbox) do
plug Phoenix.Ecto.SQL.Sandbox
end

View File

@@ -73,7 +73,7 @@
"remote_ip": {:hex, :remote_ip, "1.0.0", "3d7fb45204a5704443f480cee9515e464997f52c35e0a60b6ece1f81484067ae", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "9e9fcad4e50c43b5234bb6a9629ed6ab223f3ed07147bd35470e4ee5c8caf907"},
"rustler_precompiled": {:hex, :rustler_precompiled, "0.5.1", "93df423bd7b14b67dcacf994443d132d300623f80756974cac4febeab40af74a", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: false]}, {:rustler, "~> 0.23", [hex: :rustler, repo: "hexpm", optional: true]}], "hexpm", "3f8cbc8e92eef4e1a71bf441b568b868b16a3730f63f5b803c68073017e30b13"},
"ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.6", "cf344f5692c82d2cd7554f5ec8fd961548d4fd09e7d22f5b62482e5aeaebd4b0", [:make, :mix, :rebar3], [], "hexpm", "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680"},
"swoosh": {:hex, :swoosh, "1.7.4", "f967d9b2659e81bab241b96267aae1001d35c2beea2df9c03dcf47b007bf566f", [:mix], [{:cowboy, "~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:ex_aws, "~> 2.1", [hex: :ex_aws, repo: "hexpm", optional: true]}, {:finch, "~> 0.6", [hex: :finch, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13 or ~> 1.0", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "1553d994b4cf069162965e63de1e1c53d8236e127118d21e56ce2abeaa3f25b4"},
"swoosh": {:hex, :swoosh, "1.8.0", "51b3cfe5bb08196eba0f64b0e30f589533915b5088dd203fde110f29704289db", [:mix], [{:cowboy, "~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:ex_aws, "~> 2.1", [hex: :ex_aws, repo: "hexpm", optional: true]}, {:finch, "~> 0.6", [hex: :finch, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13 or ~> 1.0", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "fd77341d3e775a81fccfd26baacb9a47328ac8c27df0fb1d06f0312306721472"},
"telemetry": {:hex, :telemetry, "1.1.0", "a589817034a27eab11144ad24d5c0f9fab1f58173274b1e9bae7074af9cbee51", [:rebar3], [], "hexpm", "b727b2a1f75614774cff2d7565b64d0dfa5bd52ba517f16543e6fc7efcc0df48"},
"telemetry_metrics": {:hex, :telemetry_metrics, "0.6.1", "315d9163a1d4660aedc3fee73f33f1d355dcc76c5c3ab3d59e76e3edf80eef1f", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7be9e0871c41732c233be71e4be11b96e56177bf15dde64a8ac9ce72ac9834c6"},
"ueberauth": {:hex, :ueberauth, "0.10.2", "6e3b17d48c1cb7d5b2bca1255e908d49edf6150c622e5210ab3306acb84929aa", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "dfb7a5af57ed396341317b987815beace548f7deb33e760663546953b3f71c9d"},

View File

@@ -22,7 +22,7 @@ license 'Apache-2.0'
license_file '../LICENSE'
description <<~DESC
Web UI + Firewall manager for WireGuard
Open source secure remote access platform.
DESC
# Defaults to C:/firezone on Windows
@@ -40,7 +40,6 @@ build_iteration 1
# firezone build dependencies/components
dependency 'runit'
dependency 'nginx'
dependency 'erlang'
dependency 'elixir'
dependency 'openssl'
dependency 'postgresql'

View File

@@ -18,7 +18,7 @@
# expeditor/ignore: deprecated 2021-04
name 'elixir'
default_version '1.13.4'
default_version '1.14.0'
license 'Apache-2.0'
license_file 'LICENSE'
@@ -31,6 +31,7 @@ version('1.12.3') { source sha256: 'c5affa97defafa1fd89c81656464d61da8f76ccfec2e
version('1.13.1') { source sha256: 'deaba8156b11777adfa28e54e76ddf49ab1a0132cca54c41d9d7648e800edcc8' }
version('1.13.2') { source sha256: '03afed42dccf4347c4d3ae2b905134093a3ba2245d0d3098d75009a1d659ed1a' }
version('1.13.4') { source sha256: '95daf2dd3052e6ca7d4d849457eaaba09de52d65ca38d6933c65bc1cdf6b8579' }
version('1.14.0') { source sha256: 'ac129e266a1e04cdc389551843ec3dbdf36086bb2174d3d7e7936e820735003b' }
source url: "https://github.com/elixir-lang/elixir/archive/v#{version}.tar.gz"
relative_path "elixir-#{version}"