Mise à jour Erlang OTP (22->23)

.circleci/config.yml

@@ -1,9 +1,10 @@
-version: 2
+version: 2.1
 
 # useful information at https://circleci.com/docs/2.0/language-elixir/
+# and https://circleci.com/docs/2.0/reusing-config/#using-the-parameters-declaration
 
 default_docker: &default_docker
-  image: betagouv/transport:0.4.5
+  image: << parameters.base_image >>
   environment:
     MIX_ENV: test
     PG_URL_TEST: ecto://[email protected]/transport_test
@@ -13,6 +14,10 @@ default_docker: &default_docker
     SECRET_KEY_BASE: "SOME-SECRET-KEY-BASE-FOR-TESTING-SOME-SECRET-KEY-BASE-FOR-TESTING"
 
 defaults: &defaults
+  parameters:
+    base_image:
+      default: betagouv/transport:elixir-1.10.4-erlang-23.2.7.2-alpine-3.13.3
+      type: string
   working_directory: ~/transport
   docker:
     - *default_docker
@@ -21,7 +26,7 @@ defaults_with_postgres: &defaults_with_postgres
   <<: *defaults
   docker:
     - *default_docker
-    - image: mdillon/postgis:11-alpine
+    - image: circleci/postgres:12.0-alpine-postgis
       environment:
         POSTGRES_USER: root
         POSTGRES_DB: transport_test
@@ -33,14 +38,9 @@ jobs:
     steps:
       - checkout
 
-      # TODO: remove this once https://github.com/etalab/transport-ops/issues/19 is solved
-      - run:
-          name: Install git (required if we use git-hosted hex packages)
-          command: apk add --update git
-
       - restore_cache:
           keys:
-            - elixir-v9-build-{{ checksum "mix.lock" }}
+            - elixir-<< parameters.base_image >>-{{ checksum "mix.lock" }}
 
       - run:
           name: Install hex
@@ -67,7 +67,7 @@ jobs:
           command: mix deps.compile
 
       - save_cache:
-          key: elixir-v9-build-{{ checksum "mix.lock" }}
+          key: elixir-<< parameters.base_image >>-{{ checksum "mix.lock" }}
           paths:
             - ~/transport/_build
             - ~/transport/deps
@@ -87,7 +87,7 @@ jobs:
 
       - restore_cache:
           keys:
-            - elixir-v8-plt-{{ checksum "mix.lock" }}
+            - elixir-<< parameters.base_image >>-plt-{{ checksum "mix.lock" }}
 
       - run:
           name: Build PLT
@@ -97,7 +97,7 @@ jobs:
           no_output_timeout: 20m
 
       - save_cache:
-          key: elixir-v8-plt-{{ checksum "mix.lock" }}
+          key: elixir-<< parameters.base_image >>-plt-{{ checksum "mix.lock" }}
           paths:
             - ~/transport/dialyzer-plt
 
@@ -113,10 +113,6 @@ jobs:
       - attach_workspace:
           at: ~/transport
 
-      - run:
-          name: Install git (required if we use git-hosted hex packages)
-          command: apk add --update git
-
       - run:
           name: Run linters
           command: |
@@ -142,10 +138,6 @@ jobs:
       - attach_workspace:
           at: ~/transport
 
-      - run:
-          name: Install git (required if we use git-hosted hex packages)
-          command: apk add --update git
-
       - run:
           name: Run dialyzer (static analysis)
           command: MIX_ENV=dev mix dialyzer
@@ -156,10 +148,6 @@ jobs:
       - attach_workspace:
           at: ~/transport
 
-      - run:
-          name: Install git (required if we use git-hosted hex packages)
-          command: apk add --update git
-
       - run:
           name: Run tests
           command: |
@@ -173,10 +161,6 @@ jobs:
       - attach_workspace:
           at: ~/transport
 
-      - run:
-          name: Install git (required if we use git-hosted hex packages)
-          command: apk add --update git
-
       - run:
           name: Run tests
           command: |

.tool-versions

@@ -7,12 +7,12 @@
 # - https://hexdocs.pm/elixir/compatibility-and-deprecations.html
 # - https://github.com/elixir-lang/elixir/releases
 # - `asdf list all elixir`
-elixir 1.10.4-otp-22
+elixir 1.10.4-otp-23
 
 # See:
 # - https://github.com/erlang/otp/releases
 # - https://github.com/erlang/otp/blob/master/otp_versions.table
 # - `asdf list all erlang`
-erlang 22.3.4.12
+erlang 23.2.7.2
 
-nodejs 12.15.0
+nodejs 14.16.1

Dockerfile

@@ -1,7 +1,6 @@
-FROM betagouv/transport:0.4.5
+FROM betagouv/transport:elixir-1.10.4-erlang-23.2.7.2-alpine-3.13.3
 
 RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ gnu-libiconv-dev
-RUN apk add git
 
 RUN mkdir phoenixapp
 WORKDIR /phoenixapp

apps/shared/test/http_stream_v2_test.exs

@@ -20,7 +20,7 @@ defmodule HTTPStreamV2.Test do
     assert result.hash == :sha256 |> :crypto.hash("Contenu éphémère") |> Base.encode16 |> String.downcase
     assert result.body_byte_size == ("Contenu éphémère" |> byte_size())
     headers = result.headers
-    |> Enum.filter(fn({a, b}) -> a == "hello" end)
+    |> Enum.filter(fn({key, _val}) -> key == "hello" end)
 
     assert headers == [{"hello", "header"}]
   end

apps/transport/test/build_test.exs

@@ -33,6 +33,16 @@ defmodule TransportWeb.BuildTest do
     assert output |> String.trim() == "v" <> asdf_nodejs_release()
   end
 
+  test "make sure Docker image is same for production & CI" do
+    content = File.read!("../../Dockerfile")
+    [[_, production_version]] = Regex.scan(~r/FROM (.*)/, content)
+
+    content = File.read!("../../.circleci/config.yml")
+    [[_, ci_version]] = Regex.scan(~r/(betagouv\/transport.*)/, content)
+
+    assert ci_version == production_version
+  end
+
   # figuring out you have forgotten to upgrade the assets can be tricky, so we add a little reminder here
   test "make sure LiveView client assets are up to date" do
     {output, 0} = System.cmd("yarn", ["list", "--pattern", "phoenix_live_view"], cd: "client")