Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mise à disposition du convertisseur GTFS vers NeTEx #2049

Merged
merged 3 commits into from
Jan 17, 2022
Merged

Mise à disposition du convertisseur GTFS vers NeTEx #2049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab0b33c
Try to use GHCR-hosted image for CI (with transport-tools v1.0.1)
thbar Jan 13, 2022
4728daf
Fix build test
thbar Jan 13, 2022
b924ca1
Fix dockerfiles
thbar Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ default_docker: &default_docker
defaults: &defaults
parameters:
base_image:
default: betagouv/transport:elixir-1.12.2-erlang-24.0.4-ubuntu-focal-20210325-with-transport-tools
default: ghcr.io/etalab/transport-ops:elixir-1.12.2-erlang-24.0.4-ubuntu-focal-20210325-transport-tools-1.0.1
type: string
# useful to invalidate the build cache manually by bumping the version
build_cache_key:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM betagouv/transport:elixir-1.12.2-erlang-24.0.4-ubuntu-focal-20210325-with-transport-tools
FROM ghcr.io/etalab/transport-ops:elixir-1.12.2-erlang-24.0.4-ubuntu-focal-20210325-transport-tools-1.0.1

RUN mkdir phoenixapp
WORKDIR /phoenixapp
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM betagouv/transport:elixir-1.12.2-erlang-24.0.4-ubuntu-focal-20210325-with-transport-tools
FROM ghcr.io/etalab/transport-ops:elixir-1.12.2-erlang-24.0.4-ubuntu-focal-20210325-transport-tools-1.0.1

RUN apt-get install -y git inotify-tools postgresql-client>=11

Expand Down
6 changes: 3 additions & 3 deletions apps/transport/test/build_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ defmodule TransportWeb.BuildTest do

test "make sure Docker image is same for production & CI" do
content = File.read!("../../Dockerfile")
[[_, production_version]] = Regex.scan(~r/FROM (betagouv.*)/, content)
[[_, production_version]] = Regex.scan(~r/FROM (ghcr.*)/, content)

content = File.read!("../../Dockerfile.dev")
[[_, docker_compose_version]] = Regex.scan(~r/FROM (betagouv.*)/, content)
[[_, docker_compose_version]] = Regex.scan(~r/FROM (ghcr.*)/, content)

content = File.read!("../../.circleci/config.yml")
[[_, ci_version]] = Regex.scan(~r/(betagouv\/transport.*)/, content)
[[_, ci_version]] = Regex.scan(~r/(ghcr.*)/, content)

assert ci_version == production_version
assert ci_version == docker_compose_version
Expand Down