From 90e2cd5f6ac9fd97ab61beaf46bda393d621fd59 Mon Sep 17 00:00:00 2001 From: Marcin Kulik Date: Sun, 28 Apr 2024 11:55:00 +0200 Subject: [PATCH 1/3] Group ENV statements, use recommended syntax for it --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6296f6c40..56ddcb2c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -71,11 +71,11 @@ COPY --from=builder /opt/app/_build/prod/rel/asciinema . RUN chgrp -R 0 /opt/app && chmod -R g=u /opt/app COPY .iex.exs . -ENV PORT 4000 -ENV ADMIN_BIND_ALL 1 -ENV DATABASE_URL "postgresql://postgres@postgres/postgres" -ENV RSVG_FONT_FAMILY "Dejavu Sans Mono" -ENV PATH "/opt/app/bin:${PATH}" +ENV PORT=4000 \ + ADMIN_BIND_ALL=1 \ + DATABASE_URL=postgresql://postgres@postgres/postgres \ + RSVG_FONT_FAMILY="Dejavu Sans Mono" \ + PATH=/opt/app/bin:${PATH} ENTRYPOINT ["/sbin/tini", "--"] CMD ["/opt/app/bin/server"] From 3501f676bfc336ce016773b1bb868d30f4cc41c2 Mon Sep 17 00:00:00 2001 From: Marcin Kulik Date: Sun, 28 Apr 2024 12:15:19 +0200 Subject: [PATCH 2/3] Use matching Rust version (1.71) between test run and container image build --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5458d29a7..d57134e57 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ env: otp: '25.2.2' elixir: '1.14.3' node: '18.x' - rust: '1.68.0' + rust: '1.71.0' jobs: test: From 8cb17bf937463b59cd702808cf7cac0966207dbe Mon Sep 17 00:00:00 2001 From: Marcin Kulik Date: Sun, 28 Apr 2024 12:15:55 +0200 Subject: [PATCH 3/3] Use cargo's sparse protocol for fetching Rust deps in test workflow --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d57134e57..446e162bf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,6 +35,7 @@ jobs: env: MIX_ENV: test + CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse steps: - uses: actions/checkout@v3