From c0f37c429253a009af5ea39fdff697a190b1dcdf Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Mon, 15 Oct 2018 15:49:09 -0500 Subject: [PATCH] Fix PSQL dep mismatch --- db/structure.sql | 5 ++++- docker_configs/api.Dockerfile | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/db/structure.sql b/db/structure.sql index 2317b063b..228cd2cf4 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -2389,5 +2389,8 @@ INSERT INTO "schema_migrations" (version) VALUES ('20180829211322'), ('20180910143055'), ('20180920194120'), +('20180925203846'), ('20180926161918'), -('20180925203846'); +('20181014231010'); + + diff --git a/docker_configs/api.Dockerfile b/docker_configs/api.Dockerfile index 9b2c2eee6..eb8762288 100644 --- a/docker_configs/api.Dockerfile +++ b/docker_configs/api.Dockerfile @@ -1,4 +1,7 @@ FROM ruby:2.5 +# WHY: We need Postgres 10, not the default (9) +RUN wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key add - +RUN sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' RUN apt-get update -qq && apt-get install -y build-essential libpq-dev \ postgresql postgresql-contrib RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -