Преглед на файлове

include new application

pull/44/head
Guillaume Vincent преди 8 години
родител
ревизия
3f3cbacd98
променени са 6 файла, в които са добавени 26 реда и са изтрити 51 реда
  1. +1
    -1
      backend
  2. +1
    -1
      core
  3. +0
    -40
      docker-compose.dev.yml
  4. +17
    -0
      docker-compose.prod.yml
  5. +6
    -8
      docker-compose.yml
  6. +1
    -1
      webextension

+ 1
- 1
backend

@@ -1 +1 @@
Subproject commit 2890033136c52ed8e22c32468d18470b2e2230c1
Subproject commit 8489ee76c5552535dc202c3ca45b16b0495327f1

+ 1
- 1
core

@@ -1 +1 @@
Subproject commit 5d5d8a046d4c78450236e0f6449cb8912fcbf137
Subproject commit 1d4369e72adf26cc3aa6fe68a5ac52677452266f

+ 0
- 40
docker-compose.dev.yml Целия файл

@@ -1,40 +0,0 @@
version: '2'
services:
db:
image: postgres:9.5
volumes:
- postgresql:/var/lib/postgresql/data
backend:
build: ./backend
volumes:
- ./backend:/backend
ports:
- "8000:8000"
depends_on:
- db
command: python manage.py runserver 0.0.0.0:8000
frontend:
build: ./frontend
volumes:
- ./frontend:/frontend
- node_modules:/frontend/node_modules
ports:
- "8080:8080"
command: npm run dev
nginx:
build: ./nginx
ports:
- "80:80"
- "443:443"
environment:
- domain=lesspass.com
volumes:
- ./nginx/ssl:/certificates
volumes_from:
- backend
links:
- backend
- frontend
volumes:
postgresql:
node_modules:

+ 17
- 0
docker-compose.prod.yml Целия файл

@@ -0,0 +1,17 @@
version: '2'
services:
backend:
restart: always
volumes:
- backend:/backend
command: /usr/bin/supervisord
frontend:
restart: always
volumes:
- frontend:/frontend
command: npm start
nginx:
restart: always
volumes:
backend:
frontend:

+ 6
- 8
docker-compose.yml Целия файл

@@ -6,23 +6,23 @@ services:
volumes:
- postgresql:/var/lib/postgresql/data
backend:
restart: always
build: ./backend
volumes:
- backend:/backend
- ./backend:/backend
ports:
- "8000:8000"
depends_on:
- db
command: python manage.py runserver 0.0.0.0:8000
frontend:
restart: always
build: ./frontend
volumes:
- frontend:/frontend
- ./frontend:/frontend
- /frontend/node_modules
ports:
- "8080:8080"
command: npm run dev
nginx:
restart: always
build: ./nginx
ports:
- "80:80"
@@ -37,6 +37,4 @@ services:
- backend
- frontend
volumes:
postgresql:
backend:
frontend:
postgresql:

+ 1
- 1
webextension

@@ -1 +1 @@
Subproject commit 234ed253e062eaa7d11e84f6601a6c518864e80c
Subproject commit fc8d3b0c9585e9ade018da66fbd8380b057d0106

Зареждане…
Отказ
Запис