From 574c8b03d174c263a4f090e25626f810bec85df1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= Date: Mon, 26 Sep 2022 17:22:27 +0200 Subject: [PATCH] =?UTF-8?q?Mises=20=C3=A0=20jour=20techniques=20(Elixir=20?= =?UTF-8?q?14,=20...)=20(#47)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add todo * Bump Elixir to 1.14 & Erlang to latest 24.3.4.x * Bump node * Bump up transport-tools * Fix binary (although unused currently) * Fix NodeJS test * Bump up tests --- .github/workflows/docker.yml | 6 +++--- transport-site/Dockerfile | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 66d63bc..8611899 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -17,9 +17,9 @@ env: REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} TEST_TAG: ${{ github.repository }}:test - TEST_EXPECTED_NODE_OUTPUT: "v16.15.0" - TEST_EXPECTED_ELIXIR_OUTPUT: "Elixir 1.13.4 (compiled with Erlang/OTP 24)" - TEST_EXPECTED_ERLANG_OUTPUT: "24.3.4" + TEST_EXPECTED_NODE_OUTPUT: "v16.17.1" + TEST_EXPECTED_ELIXIR_OUTPUT: "Elixir 1.14.0 (compiled with Erlang/OTP 24)" + TEST_EXPECTED_ERLANG_OUTPUT: "24.3.4.5" jobs: build-and-push-image: runs-on: ubuntu-latest diff --git a/transport-site/Dockerfile b/transport-site/Dockerfile index 6cfae55..e22d439 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.3 as transport-tools +FROM ghcr.io/etalab/transport-tools:v1.0.4 as transport-tools # We leverage the base images published by hexpm at: # @@ -21,7 +21,7 @@ FROM ghcr.io/etalab/transport-tools:v1.0.3 as transport-tools # So again, to upgrade this, check out : # # https://hub.docker.com/r/hexpm/elixir -FROM hexpm/elixir:1.13.4-erlang-24.3.4-ubuntu-focal-20211006 +FROM hexpm/elixir:1.14.0-erlang-24.3.4.5-ubuntu-focal-20211006 ARG DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris @@ -69,7 +69,7 @@ RUN cat /etc/os-release RUN cat /etc/lsb-release ENV NVM_VERSION v0.39.1 -ENV NODE_VERSION 16.15.0 +ENV NODE_VERSION 16.17.1 ENV NVM_DIR $HOME/.nvm RUN mkdir $NVM_DIR @@ -107,5 +107,5 @@ COPY --from=transport-tools /usr/share/proj/ /usr/share/proj/ RUN /transport-tools/gtfs2netexfr --help COPY --from=transport-tools /usr/local/bin/gtfs-realtime-validator-lib-1.0.0-SNAPSHOT.jar ./transport-tools RUN java -jar /transport-tools/gtfs-realtime-validator-lib-1.0.0-SNAPSHOT.jar 2>&1 | grep "For batch mode you must provide a path and file name to GTFS data" -COPY --from=transport-tools /usr/local/bin/gtfs-validator-v3.0.0_cli.jar ./transport-tools -RUN java -jar /transport-tools/gtfs-validator-v3.0.0_cli.jar --help | grep "Location of the input GTFS ZIP" +COPY --from=transport-tools /usr/local/bin/gtfs-validator-3.1.1-cli.jar ./transport-tools +RUN java -jar /transport-tools/gtfs-validator-3.1.1-cli.jar --help | grep "Location of the input GTFS ZIP"