Michelle/scalelite-run
1
0
Fork 0
mirror of https://github.com/michelleDeko/scalelite-run.git synced 2026-02-05 07:40:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added postgress

Browse Source
This commit is contained in:
jfederico
2020-02-12 15:33:17 -05:00
parent daff9376ef
commit 8d9217b767
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
docker-compose.yml
View File

@@ -32,6 +32,19 @@ services:
volumes: volumes:
- ./data/redis/:/data - ./data/redis/:/data
postgres:
image: postgres:9.5
restart: "no"
ports:
- 127.0.0.1:5432:5432
volumes:
- ./data/postgres/:/var/lib/postgresql/data
environment:
- PGHOST=postgres
- PGDATABASE=postgres
- PGUSER=postgres
- PGPASSWORD=password
scalelite.api: scalelite.api:
entrypoint: [bin/start] entrypoint: [bin/start]
image: blindsidenetwks/scalelite:master image: blindsidenetwks/scalelite:master
@@ -40,8 +53,9 @@ services:
- 127.0.0.1:3000:3000 - 127.0.0.1:3000:3000
links: links:
- redis - redis
- postgres
volumes: volumes:
# - ./scalelite/log/api:/srv/scalelite/log - ./scalelite/log/api:/srv/scalelite/log
- ./scalelite/bin/start:/srv/scalelite/bin/start - ./scalelite/bin/start:/srv/scalelite/bin/start
- ./scalelite/tmp/pids/:/usr/src/app/tmp/pids - ./scalelite/tmp/pids/:/usr/src/app/tmp/pids
- ./scalelite/tmp/sockets/:/usr/src/app/tmp/sockets - ./scalelite/tmp/sockets/:/usr/src/app/tmp/sockets
@@ -49,6 +63,10 @@ services:
env_file: ./scalelite/.env env_file: ./scalelite/.env
environment: environment:
- REDIS_URL=redis://redis:6379 - REDIS_URL=redis://redis:6379
- DB_HOST=postgres
- DB_NAME=scalelite_production
- DB_USERNAME=postgres
- DB_PASSWORD=password
- URL_HOST=${HOST_NAME:-sl}.${DOMAIN_SUB:-lab}.${DOMAIN_ROOT:-bigbluebutton.org} - URL_HOST=${HOST_NAME:-sl}.${DOMAIN_SUB:-lab}.${DOMAIN_ROOT:-bigbluebutton.org}
scalelite.poller: scalelite.poller:
@@ -60,7 +78,7 @@ services:
links: links:
- redis - redis
volumes: volumes:
# - ./scalelite/log/poller:/srv/scalelite/log - ./scalelite/log/poller:/srv/scalelite/log
- ./scalelite/bin/start-poller:/srv/scalelite/bin/start-poller - ./scalelite/bin/start-poller:/srv/scalelite/bin/start-poller
env_file: ./scalelite/.env env_file: ./scalelite/.env
environment: environment:

6
scripts/build.sh
View File

@@ -63,8 +63,8 @@ if [ $sqliteCount -lt 2 ]; then
fi fi
# Set the version tag when it is a release or the commit sha was included. # Set the version tag when it is a release or the commit sha was included.
if [[ "$CD_REF_NAME" == *"release"* ]]; then if [[ "$CD_REF_NAME" == *"v"* ]]; then
export CD_BUILD_NUMBER=${CD_REF_NAME:8} export CD_BUILD_NUMBER=${CD_REF_NAME:1}
else else
export CD_BUILD_NUMBER="$CD_REF_NAME ($(expr substr $(git rev-parse HEAD) 1 7))" export CD_BUILD_NUMBER="$CD_REF_NAME ($(expr substr $(git rev-parse HEAD) 1 7))"
fi fi
@@ -87,7 +87,7 @@ echo "#### Docker image $CD_DOCKER_REPO:$CD_REF_NAME is being published"
docker push $CD_DOCKER_REPO docker push $CD_DOCKER_REPO
# Publish image as latest and v2 if it is a release (excluding alpha and beta) # Publish image as latest and v2 if it is a release (excluding alpha and beta)
if [[ "$CD_REF_NAME" == *"release"* ]] && [[ "$CD_REF_NAME" != *"alpha"* ]] && [[ "$CD_REF_NAME" != *"beta"* ]]; then if [[ "$CD_REF_NAME" == *"v"* ]] && [[ "$CD_REF_NAME" != *"alpha"* ]] && [[ "$CD_REF_NAME" != *"beta"* ]]; then
docker_image_id=$(docker images | grep -E "^$CD_DOCKER_REPO.*$CD_REF_NAME" | awk -e '{print $3}') docker_image_id=$(docker images | grep -E "^$CD_DOCKER_REPO.*$CD_REF_NAME" | awk -e '{print $3}')
docker tag $docker_image_id $CD_DOCKER_REPO:latest docker tag $docker_image_id $CD_DOCKER_REPO:latest
docker push $CD_DOCKER_REPO:latest docker push $CD_DOCKER_REPO:latest