Skip to content

Commit

Permalink
Mises à jour techniques (Elixir 14, ...) (#47)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
thbar committed Sep 26, 2022
1 parent c39cbf9 commit 574c8b0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions transport-site/Dockerfile
Original file line number Diff line number Diff line change
@@ -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:
#
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"

0 comments on commit 574c8b0

Please sign in to comment.