Merge pull request #1269 from gabrielburnworth/fix_apt_ci_issue

Fix apt ci issue
pull/1270/head
Rick Carlino 2019-07-13 12:54:33 -05:00 committed by GitHub
commit ff957f9ecb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions

View File

@ -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

View File

@ -1,10 +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 sh -c 'echo "\nPackage: *\nPin: origin deb.nodesource.com\nPin-Priority: 700\n" >> /etc/apt/preferences'
RUN apt-get install -y nodejs
RUN mkdir /farmbot
WORKDIR /farmbot