From 3e6698c08fa969cd1b826b0aaaead332c3d4e625 Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Mon, 16 Jul 2018 15:19:06 -0700 Subject: [PATCH 1/2] Add postrgesql client to citygram/citygram Dockerfile Needed for running many db:* rake comamnds from within the docker container. --- docker/citygram/Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker/citygram/Dockerfile b/docker/citygram/Dockerfile index d584579..b59b94f 100644 --- a/docker/citygram/Dockerfile +++ b/docker/citygram/Dockerfile @@ -1,6 +1,11 @@ FROM node:6.11 as nodejs FROM ruby:2.5.0 +# needed for lib/database_helper.rb +RUN echo deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main > /etc/apt/sources.list.d/pgdg.list && \ + wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - +RUN apt update && apt install --yes postgresql-client-10 + COPY --from=nodejs /usr/local/lib/node_modules /usr/local/lib/node_modules/ COPY --from=nodejs /usr/local/include/node /usr/local/include/node/ COPY --from=nodejs /usr/local/bin /usr/local/bin/ From 06231641eca313368cd8af3f85b25c10a5c6e1c3 Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Tue, 24 Jul 2018 15:38:12 -0700 Subject: [PATCH 2/2] Move pg client installation below nodejs copies in Dockerfile --- docker/citygram/Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docker/citygram/Dockerfile b/docker/citygram/Dockerfile index b59b94f..5771ea8 100644 --- a/docker/citygram/Dockerfile +++ b/docker/citygram/Dockerfile @@ -1,16 +1,15 @@ FROM node:6.11 as nodejs FROM ruby:2.5.0 -# needed for lib/database_helper.rb -RUN echo deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main > /etc/apt/sources.list.d/pgdg.list && \ - wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - -RUN apt update && apt install --yes postgresql-client-10 - COPY --from=nodejs /usr/local/lib/node_modules /usr/local/lib/node_modules/ COPY --from=nodejs /usr/local/include/node /usr/local/include/node/ COPY --from=nodejs /usr/local/bin /usr/local/bin/ COPY --from=nodejs /opt/yarn /opt/yarn +# needed for lib/database_helper.rb +RUN echo deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main > /etc/apt/sources.list.d/pgdg.list && \ + wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - +RUN apt update && apt install --yes postgresql-client-10 RUN mkdir -p /app ENV PORT 9292