Réparer le docker compose (#1783)

* update betagouv/transport container to latest version

* add git to fetch dependencies from github

* update wait for it script

* add test for docker compose base image

* add note about Antoine's db image use

* add an .env.example file

* update readme for docker instructions

Author: fchabouis

.env.example

@@ -0,0 +1,20 @@
+SECRET_KEY_BASE="SOME-LONG-SECRET-KEY-BASE-FOR-TESTING-SOME-LONG-SECRET-KEY-BASE-FOR-TESTING"
+
+GTFS_VALIDATOR_URL=https://transport-validator.cleverapps.io
+
+DATAGOUVFR_SITE=https://demo.data.gouv.fr
+DATAGOUVFR_REDIRECT_URI=http://localhost:5000/login/callback
+DATAGOUVFR_CLIENT_SECRET=
+DATAGOUVFR_CLIENT_ID=
+DATAGOUVFR_API_KEY=
+
+
+# Optional ----------------------
+CELLAR_ACCESS_KEY_ID=
+CELLAR_SECRET_ACCESS_KEY=
+
+MJ_APIKEY_PUBLIC=
+MJ_APIKEY_PRIVATE=
+
+JCDECAUX_APIKEY=
+# -------------------------------

Dockerfile.dev

@@ -1,15 +1,16 @@
-FROM betagouv/transport:0.4.3
+FROM betagouv/transport:elixir-1.12.2-erlang-24.0.3-alpine-3.13.3
 
 RUN apk add inotify-tools
 RUN apk add postgresql-client>=11
+RUN apk add git
 
 RUN mkdir /app/
 RUN mkdir /app/_build
 RUN mkdir /app/deps/
 WORKDIR /app/
 
 # fetch a wait-for-it script to wait for postgres startup
-ADD https://raw.githubusercontent.com/vishnubob/wait-for-it/54d1f0bfeb6557adf8a3204455389d0901652242/wait-for-it.sh /opt/bin/
+ADD https://raw.githubusercontent.com/vishnubob/wait-for-it/81b1373f17855a4dc21156cfe1694c31d7d1792e/wait-for-it.sh /opt/bin/
 RUN chmod +x /opt/bin/wait-for-it.sh
 
 ADD docker_phoenix_startup.sh /docker_phoenix_startup.sh

README.md

@@ -152,7 +152,7 @@ To run a custom task: `mix <custom task>`
 
 If you don't plan to work a lot on this project, the docker installation is way easier.
 
-You need a .env file with the same variables that you have in .envrc.example (but you'll need to remove `export` at the beginning of each line.
+You need a .env file, and can use .env.example to see which variables need to be set.
 (No need to setup the variable `PG_URL`, it is defined in the docker-compose.yml)
 
 Then you only need to run:

apps/transport/test/build_test.exs

@@ -37,10 +37,14 @@ defmodule TransportWeb.BuildTest do
     content = File.read!("../../Dockerfile")
     [[_, production_version]] = Regex.scan(~r/FROM (.*)/, content)
 
+    content = File.read!("../../Dockerfile.dev")
+    [[_, docker_compose_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
+    assert ci_version == docker_compose_version
   end
 
   # figuring out you have forgotten to upgrade the assets can be tricky, so we add a little reminder here

docker-compose.yml

@@ -1,6 +1,7 @@
 version: "3"
 services:
   database:
+    # this will need to be replaced, as the DB content is now really old
     image: antoinede/transport_data_gouv_dev_database
     volumes:
       - pgdata:/var/lib/postgresql/data