Skip to content

Commit

Permalink
Released 0.5.1, moved build and run docker compose config around
Browse files Browse the repository at this point in the history
  • Loading branch information
ArsenyYankovsky committed Oct 3, 2020
1 parent 40a611c commit 23eb84a
Show file tree
Hide file tree
Showing 11 changed files with 56 additions and 53 deletions.
12 changes: 6 additions & 6 deletions .gitmodules
@@ -1,6 +1,6 @@
[submodule "recap.dev-ui"]
path = recap.dev-ui
url = git@github.com:ArsenyYankovsky/recap.dev-ui.git
[submodule "recap.dev-backend"]
path = recap.dev-backend
url = git@github.com:ArsenyYankovsky/recap.dev-backend.git
[submodule "build/recap.dev-ui"]
path = build/recap.dev-ui
url = git@github.com:infinite-cat/recap.dev-ui.git
[submodule "build/recap.dev-backend"]
path = build/recap.dev-backend
url = git@github.com:infinite-cat/recap.dev-backend.git
6 changes: 6 additions & 0 deletions build/.gitmodules
@@ -0,0 +1,6 @@
[submodule "recap.dev-ui"]
path = recap.dev-ui
url = git@github.com:ArsenyYankovsky/recap.dev-ui.git
[submodule "recap.dev-backend"]
path = recap.dev-backend
url = git@github.com:ArsenyYankovsky/recap.dev-backend.git
File renamed without changes.
File renamed without changes.
20 changes: 20 additions & 0 deletions build/docker-compose.yml
@@ -0,0 +1,20 @@
version: '3.0'

services:
recap_dev_server:
build: .
container_name: recap_dev_server
image: recapdev/server:0.5.1
environment:
postgresHost: postgres
postgresUsername: postgres
postgresPassword: password
postgresDatabase: postgres
ports:
- "8081:8081"
- "8080:8080"
restart: unless-stopped

recap_dev_server_latest:
extends: recap_dev_server
image: recapdev/server:latest
1 change: 1 addition & 0 deletions build/recap.dev-backend
Submodule recap.dev-backend added at 40cc99
1 change: 1 addition & 0 deletions build/recap.dev-ui
Submodule recap.dev-ui added at 6fae65
28 changes: 22 additions & 6 deletions docker-compose.yml
@@ -1,22 +1,38 @@
version: '3.0'
version: '2.4'

services:
postgres:
restart: unless-stopped
container_name: postgres_container
image: postgres:12
environment:
POSTGRES_USER: 'postgres'
POSTGRES_PASSWORD: 'password'
PGDATA: /data/postgres
volumes:
- postgres:/data/postgres
ports:
- "5432:5432"
networks:
- postgres
recap_dev_server:
build: .
container_name: recap_dev_server
image: recapdev/server:0.5-postgres
image: recapdev/server:0.5.1
environment:
postgresHost: postgres
postgresUsername: postgres
postgresPassword: password
postgresDatabase: postgres
mem_limit: 500m
ports:
- "8081:8081"
- "8080:8080"
networks:
- postgres
restart: unless-stopped

latest_postgres:
extends: build
image: recapdev/server:latest-postgres
networks:
postgres:
driver: bridge
volumes:
postgres:
1 change: 0 additions & 1 deletion recap.dev-backend
Submodule recap.dev-backend deleted from b07fb2
1 change: 0 additions & 1 deletion recap.dev-ui
Submodule recap.dev-ui deleted from 31258c
39 changes: 0 additions & 39 deletions run/docker-compose.yml

This file was deleted.

0 comments on commit 23eb84a

Please sign in to comment.