From 8b2cef8727b19a1a4b37cbae86d40d6ef4594447 Mon Sep 17 00:00:00 2001 From: gabrielburnworth Date: Fri, 12 Jul 2019 16:57:12 -0700 Subject: [PATCH] fix apt ci issue --- .circleci/circle_envs | 1 - docker_configs/api.Dockerfile | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.circleci/circle_envs b/.circleci/circle_envs index 2f7477f1c..30e40fa93 100644 --- a/.circleci/circle_envs +++ b/.circleci/circle_envs @@ -1,4 +1,3 @@ -DOCKER_COMPOSE_VERSION=1.22.0 ADMIN_PASSWORD=this_is_a_fake_admin_pass POSTGRES_PASSWORD=fake_db_password_also API_HOST=10.1.10.219 diff --git a/docker_configs/api.Dockerfile b/docker_configs/api.Dockerfile index 3013899a9..9ba03fa75 100644 --- a/docker_configs/api.Dockerfile +++ b/docker_configs/api.Dockerfile @@ -1,11 +1,10 @@ FROM ruby:2.6.3 -# 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 sh -c 'VERSION_CODENAME=stretch; . /etc/os-release; echo "deb http://apt.postgresql.org/pub/repos/apt/ $VERSION_CODENAME-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 - -RUN apt-get install -y nodejs +RUN apt-get install -y nodejs npm RUN mkdir /farmbot WORKDIR /farmbot ENV BUNDLE_PATH=/bundle BUNDLE_BIN=/bundle/bin GEM_HOME=/bundle