Merge pull request #36 from buildkite/PB-40-rails-docker-parallel

PB-40 update docker

Author: SorchaAbel

Dockerfile

@@ -5,16 +5,11 @@ EXPOSE 5000
 ENV RAILS_ENV=test
 
 # Add official postgresql apt deb source
-RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
-    && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
-    && apt-get update \
-    && apt-get install -y postgresql-client-10
+RUN apt-get update && apt-get install -y postgresql-client
 
 # Node, needed for asset pipeline
-RUN curl -sL https://deb.nodesource.com/setup_11.x | bash - \
-    && apt-get update \
-    && apt-get install -y nodejs \
-    && npm install -q -g npm
+RUN apt-get update \
+  && apt-get install -y nodejs npm
 
 # Add the wait-for-it.sh script for waiting on dependent containers
 RUN curl https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh > /usr/local/bin/wait-for-it.sh \

Gemfile.lock

@@ -31,4 +31,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.15.1
+   2.6.9

docker-compose.yml

@@ -17,6 +17,7 @@ services:
     environment:
       PGHOST: db
       PGUSER: postgres
+      PGPASSWORD: postgres
       REDIS_URL: redis://redis
       MEMCACHE_SERVERS: memcache
       # CI envs
@@ -36,9 +37,12 @@ services:
 
   db:
     image: postgres
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
 
   redis:
     image: redis
 
   memcache:
-    image: tutum/memcached
+    image: memcached:latest