diff --git a/hex/Dockerfile b/hex/Dockerfile index 2b9060e88f..454bd91e16 100644 --- a/hex/Dockerfile +++ b/hex/Dockerfile @@ -2,25 +2,21 @@ FROM ghcr.io/dependabot/dependabot-updater-core RUN apt-get update \ && apt-get upgrade -y \ && apt-get install -y --no-install-recommends \ - gnupg2 + gnupg2 sudo wget + +ARG ERLANG_MAJOR_VERSION=25 + +RUN echo "deb http://binaries2.erlang-solutions.com/ubuntu/ jammy-esl-erlang-25 contrib" >> /etc/apt/sources.list +RUN wget https://binaries2.erlang-solutions.com/GPG-KEY-pmanager.asc \ + && sudo apt-key add GPG-KEY-pmanager.asc -# Install Erlang -# Note: Currently we install from Ubuntu PPA to unblock upgrading to Ubuntu 22.04, but we'd be happy to accept a PR -# switching to a more up to date PPA. See also: -# * https://github.com/esl/packages/issues/15 -# * https://github.com/dependabot/dependabot-core/pull/7865 -# * https://erlangforums.com/t/erlang-solutions-apt-package-for-otp-25/1552/1 -# * https://erlangforums.com/t/the-eef-is-looking-for-volunteers-to-take-over-esls-build-packages/2238/1 -ARG ERLANG_MAJOR_VERSION=24 -ARG ERLANG_VERSION=1:${ERLANG_MAJOR_VERSION}.2.1+dfsg-1ubuntu0.1 RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - erlang=${ERLANG_VERSION} + && apt-get install -y --no-install-recommends esl-erlang # Install Elixir # https://github.com/elixir-lang/elixir/releases -ARG ELIXIR_VERSION=v1.14.4 -ARG ELIXIR_CHECKSUM=b5705275d62ce3dae172d25d7ea567fffdabb45458abeb29c0189923b907367c +ARG ELIXIR_VERSION=v1.14.5 +ARG ELIXIR_CHECKSUM=f3b35d9fa61da7e93c9979cb8a08f64a9ce7074aeda66fae994f2a4ea2e4f82e RUN curl -sSLfO https://github.com/elixir-lang/elixir/releases/download/${ELIXIR_VERSION}/elixir-otp-${ERLANG_MAJOR_VERSION}.zip \ && echo "$ELIXIR_CHECKSUM elixir-otp-${ERLANG_MAJOR_VERSION}.zip" | sha256sum -c - \ && unzip -d /usr/local/elixir -x elixir-otp-${ERLANG_MAJOR_VERSION}.zip \ diff --git a/hex/spec/dependabot/hex/file_parser_spec.rb b/hex/spec/dependabot/hex/file_parser_spec.rb index bc5fca2d5e..fd47982dd7 100644 --- a/hex/spec/dependabot/hex/file_parser_spec.rb +++ b/hex/spec/dependabot/hex/file_parser_spec.rb @@ -476,7 +476,7 @@ it "returns the correct language" do expect(language.name).to eq "elixir" expect(language.requirement).to be_nil - expect(language.version.to_s).to eq "1.14.4" + expect(language.version.to_s).to eq "1.14.5" end end end