From d2164dfc377dc4384bae93702088858ad43da6f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= Date: Wed, 11 Sep 2024 10:35:17 +0200 Subject: [PATCH 1/5] Bump Elixir to 1.17.2 and OTP to 27.0.1 --- .github/workflows/docker.yml | 4 ++-- transport-site/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index f76ffca..7a6719b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -20,8 +20,8 @@ env: IMAGE_NAME: ${{ github.repository }} TEST_TAG: ${{ github.repository }}:test TEST_EXPECTED_NODE_OUTPUT: "v20.11.1" - TEST_EXPECTED_ELIXIR_OUTPUT: "Elixir 1.16.2 (compiled with Erlang/OTP 25)" - TEST_EXPECTED_ERLANG_OUTPUT: "25.3.2.10" + TEST_EXPECTED_ELIXIR_OUTPUT: "Elixir 1.17.2 (compiled with Erlang/OTP 27)" + TEST_EXPECTED_ERLANG_OUTPUT: "27.0.1" jobs: build-and-push-image: runs-on: ubuntu-latest diff --git a/transport-site/Dockerfile b/transport-site/Dockerfile index eeaf51a..7f7b3fe 100644 --- a/transport-site/Dockerfile +++ b/transport-site/Dockerfile @@ -21,7 +21,7 @@ FROM ghcr.io/etalab/transport-tools:v1.0.7 as transport-tools # So again, to upgrade this, check out : # # https://hub.docker.com/r/hexpm/elixir -FROM hexpm/elixir:1.16.2-erlang-25.3.2.10-ubuntu-focal-20240216 +FROM hexpm/elixir:1.17.2-erlang-27.0.1-ubuntu-focal-20240530 ARG DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris From 6eab9f98974e146bfef18c815008de2a4dfbe8fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= Date: Wed, 11 Sep 2024 16:08:23 +0200 Subject: [PATCH 2/5] Fix warning --- transport-site/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport-site/Dockerfile b/transport-site/Dockerfile index 7f7b3fe..21c96c0 100644 --- a/transport-site/Dockerfile +++ b/transport-site/Dockerfile @@ -1,5 +1,5 @@ # We are interested in the binaries compiled on that container: -FROM ghcr.io/etalab/transport-tools:v1.0.7 as transport-tools +FROM ghcr.io/etalab/transport-tools:v1.0.7 AS transport-tools # We leverage the base images published by hexpm at: # From 579fc1280d500ee105fdbed3d45f622ee55b6cb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= Date: Wed, 11 Sep 2024 16:10:51 +0200 Subject: [PATCH 3/5] Fix deprecation warning --- transport-site/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/transport-site/Dockerfile b/transport-site/Dockerfile index 21c96c0..7434bbf 100644 --- a/transport-site/Dockerfile +++ b/transport-site/Dockerfile @@ -72,9 +72,9 @@ RUN uname --all RUN cat /etc/os-release RUN cat /etc/lsb-release -ENV NVM_VERSION v0.39.7 -ENV NODE_VERSION 20.11.1 -ENV NVM_DIR $HOME/.nvm +ENV NVM_VERSION=v0.39.7 +ENV NODE_VERSION=20.11.1 +ENV NVM_DIR=$HOME/.nvm RUN mkdir $NVM_DIR @@ -85,8 +85,8 @@ RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/${NVM_VERSION}/ins RUN . $NVM_DIR/nvm.sh && nvm install $NODE_VERSION && nvm use --delete-prefix $NODE_VERSION # add to path -ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules -ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH +ENV NODE_PATH=$NVM_DIR/v$NODE_VERSION/lib/node_modules +ENV PATH=$NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH RUN npm install -g yarn From 6c48b93f39b90676fcd84eae629bd77aa876c4fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= Date: Wed, 11 Sep 2024 16:30:04 +0200 Subject: [PATCH 4/5] Upgrade NVM to latest --- transport-site/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport-site/Dockerfile b/transport-site/Dockerfile index 7434bbf..dfbe0c5 100644 --- a/transport-site/Dockerfile +++ b/transport-site/Dockerfile @@ -72,7 +72,7 @@ RUN uname --all RUN cat /etc/os-release RUN cat /etc/lsb-release -ENV NVM_VERSION=v0.39.7 +ENV NVM_VERSION=v0.40.1 ENV NODE_VERSION=20.11.1 ENV NVM_DIR=$HOME/.nvm From 83f4fafcaa9a7bbb363c01a2d97ca3562123f4c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= Date: Fri, 13 Sep 2024 15:03:15 +0200 Subject: [PATCH 5/5] Bump Node to current LTS --- .github/workflows/docker.yml | 2 +- transport-site/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7a6719b..80dd268 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -19,7 +19,7 @@ env: REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} TEST_TAG: ${{ github.repository }}:test - TEST_EXPECTED_NODE_OUTPUT: "v20.11.1" + TEST_EXPECTED_NODE_OUTPUT: "v20.17.0" TEST_EXPECTED_ELIXIR_OUTPUT: "Elixir 1.17.2 (compiled with Erlang/OTP 27)" TEST_EXPECTED_ERLANG_OUTPUT: "27.0.1" jobs: diff --git a/transport-site/Dockerfile b/transport-site/Dockerfile index dfbe0c5..13358b6 100644 --- a/transport-site/Dockerfile +++ b/transport-site/Dockerfile @@ -73,7 +73,7 @@ RUN cat /etc/os-release RUN cat /etc/lsb-release ENV NVM_VERSION=v0.40.1 -ENV NODE_VERSION=20.11.1 +ENV NODE_VERSION=20.17.0 ENV NVM_DIR=$HOME/.nvm RUN mkdir $NVM_DIR