Update postgres and redis (#704)

* Update postgres and redis * Update postgres in CI
csvalpha · May 22, 2022 · bd71158 · bd71158
1 parent 5571605
commit bd71158
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -37,7 +37,10 @@ jobs:
     needs: build
     services:
       db:
-        image: postgres:11.2
+        image: postgres:14.2
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -65,8 +68,8 @@ jobs:
         env:
           RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
         run: |
-          docker run -e POSTGRES_USER=postgres -e POSTGRES_HOST=localhost -e RAILS_MASTER_KEY --network=host app \
-            bin/ci.sh lint
+          docker run -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres -e POSTGRES_HOST=localhost -e \
+            RAILS_MASTER_KEY --network=host app bin/ci.sh lint
 
   test:
     name: Test
@@ -101,5 +104,5 @@ jobs:
         env:
           RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
         run: |
-          docker run -e POSTGRES_USER=postgres -e POSTGRES_HOST=localhost -e RAILS_MASTER_KEY --network=host app \
-            bin/ci.sh spec
+          docker run -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres -e POSTGRES_HOST=localhost -e \
+            RAILS_MASTER_KEY --network=host app bin/ci.sh spec
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,12 +4,12 @@ version: '3'
 services:
   db:
     env_file: .env # must include POSTGRES_PASSWORD, POSTGRES_USER, POSTGRES_HOST
-    image: postgres:11.2
+    image: postgres:14.2
     volumes:
       - postgres_data:/var/lib/postgresql/data
   redis:
     env_file: .env # must include POSTGRES_PASSWORD, POSTGRES_USER, POSTGRES_HOST
-    image: 'redis:5.0-alpine'
+    image: 'redis:6.2-alpine'
     command: redis-server --requirepass ${REDIS_PASSWORD}
     volumes:
       - redis_data:/var/lib/redis/data