Ver código fonte

chore: Add postgres to dev-server docker-compose

Michael Bromley 5 anos atrás
pai
commit
7aaab794d3

+ 2 - 1
.github/workflows/build_and_test.yml

@@ -55,7 +55,8 @@ jobs:
       postgres:
         image: postgres:12
         env:
-          POSTGRES_PASSWORD: Be70
+          POSTGRES_USER: admin
+          POSTGRES_PASSWORD: secret
         ports:
           - 5432
         options: --health-cmd=pg_isready --health-interval=10s --health-timeout=5s --health-retries=3

+ 2 - 2
e2e-common/test-config.ts

@@ -60,8 +60,8 @@ function getDbConfig(): ConnectionOptions {
                 type: 'postgres',
                 host: '127.0.0.1',
                 port: process.env.CI ? +(process.env.E2E_POSTGRES_PORT || 5432) : 5432,
-                username: 'postgres',
-                password: 'Be70',
+                username: 'admin',
+                password: 'secret',
             };
         case 'mysql':
             return {

+ 3 - 3
packages/dev-server/dev-config.ts

@@ -100,9 +100,9 @@ function getDbConfig(): ConnectionOptions {
                 type: 'postgres',
                 host: '127.0.0.1',
                 port: 5432,
-                username: 'postgres',
-                password: 'Be70',
-                database: 'vendure',
+                username: 'admin',
+                password: 'secret',
+                database: 'vendure-dev',
             };
         case 'sqlite':
             console.log('Using sqlite connection');

+ 30 - 1
packages/dev-server/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '3.7'
 services:
   mariadb:
     image: 'bitnami/mariadb:latest'
@@ -19,7 +19,36 @@ services:
       - mariadb
     volumes:
       - 'phpmyadmin_data:/bitnami'
+  postgres:
+    image: postgres:12.3
+    restart: always
+    environment:
+      POSTGRES_DB: postgres
+      POSTGRES_USER: admin
+      POSTGRES_PASSWORD: secret
+      PGDATA: /var/lib/postgresql/data
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    ports:
+      - "5432:5432"
+  pgadmin:
+    image: dpage/pgadmin4:4.18
+    restart: always
+    environment:
+      PGADMIN_DEFAULT_EMAIL: admin@localhost.dev
+      PGADMIN_DEFAULT_PASSWORD: secret
+      PGADMIN_LISTEN_PORT: 80
+    ports:
+      - "8080:80"
+    volumes:
+      - pgadmin_data:/var/lib/pgadmin
+    links:
+      - "postgres:pgsql-server"
 volumes:
+  postgres_data:
+    driver: local
+  pgadmin_data:
+    driver: local
   mariadb_data:
     driver: local
   phpmyadmin_data: