mirror of
https://github.com/bonfire-networks/bonfire-app.git
synced 2024-05-15 07:32:42 +00:00
Merge branch 'bonfire-networks:main' into main
This commit is contained in:
commit
8467fbc2ee
5
.github/workflows/bonfire.yaml
vendored
5
.github/workflows/bonfire.yaml
vendored
|
@ -23,8 +23,7 @@ jobs:
|
||||||
ENCRYPTION_SALT: "l+QT/gkdX722f57qSAUc+bZcqm5ZduXY4D0hp0glEiKdR267JsZ1/CZlrlhADcD8kzuaZGFWvJ2dlr6sujbzGQV5e04lKVIsZh3gfd8eqQBckIqH6L8TDRRz4M07YE+F"
|
ENCRYPTION_SALT: "l+QT/gkdX722f57qSAUc+bZcqm5ZduXY4D0hp0glEiKdR267JsZ1/CZlrlhADcD8kzuaZGFWvJ2dlr6sujbzGQV5e04lKVIsZh3gfd8eqQBckIqH6L8TDRRz4M07YE+F"
|
||||||
services:
|
services:
|
||||||
postgres:
|
postgres:
|
||||||
# image: postgres
|
image: postgres:12-alpine
|
||||||
image: postgis/postgis:12-3.0-alpine
|
|
||||||
env:
|
env:
|
||||||
POSTGRES_DB: bonfire_test
|
POSTGRES_DB: bonfire_test
|
||||||
POSTGRES_PASSWORD: postgres
|
POSTGRES_PASSWORD: postgres
|
||||||
|
@ -103,7 +102,7 @@ jobs:
|
||||||
services:
|
services:
|
||||||
postgres:
|
postgres:
|
||||||
# image: postgres
|
# image: postgres
|
||||||
image: postgis/postgis:12-3.0-alpine
|
image: postgis/postgis:12-3.1-alpine
|
||||||
env:
|
env:
|
||||||
POSTGRES_DB: bonfire_test
|
POSTGRES_DB: bonfire_test
|
||||||
POSTGRES_PASSWORD: postgres
|
POSTGRES_PASSWORD: postgres
|
||||||
|
|
1
Makefile
1
Makefile
|
@ -28,6 +28,7 @@ APP_REL_DOCKERCOMPOSE=docker-compose.release.yml
|
||||||
APP_VSN ?= `grep -m 1 'version:' mix.exs | cut -d '"' -f2`
|
APP_VSN ?= `grep -m 1 'version:' mix.exs | cut -d '"' -f2`
|
||||||
APP_BUILD ?= `git rev-parse --short HEAD`
|
APP_BUILD ?= `git rev-parse --short HEAD`
|
||||||
APP_DOCKER_REPO="$(ORG_NAME)/$(APP_NAME)-$(FLAVOUR)"
|
APP_DOCKER_REPO="$(ORG_NAME)/$(APP_NAME)-$(FLAVOUR)"
|
||||||
|
DB_DOCKER_IMAGE ?= postgis/postgis:12-3.1-alpine
|
||||||
|
|
||||||
#### GENERAL SETUP RELATED COMMANDS ####
|
#### GENERAL SETUP RELATED COMMANDS ####
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@ services:
|
||||||
source: ./data/uploads
|
source: ./data/uploads
|
||||||
target: /frontend/uploads
|
target: /frontend/uploads
|
||||||
db:
|
db:
|
||||||
image: postgis/postgis:12-3.0-alpine
|
image: ${DB_DOCKER_IMAGE}
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- "./data/postgres/prod:/var/lib/postgresql/data"
|
- "./data/postgres/prod:/var/lib/postgresql/data"
|
||||||
|
|
|
@ -34,7 +34,7 @@ services:
|
||||||
tty: true # like docker run -t
|
tty: true # like docker run -t
|
||||||
# user: $UID:$GID
|
# user: $UID:$GID
|
||||||
db:
|
db:
|
||||||
image: postgis/postgis:12-3.1-alpine
|
image: ${DB_DOCKER_IMAGE}
|
||||||
# volumes:
|
# volumes:
|
||||||
# - ./data/postgres/dev:/var/lib/postgresql/data:z
|
# - ./data/postgres/dev:/var/lib/postgresql/data:z
|
||||||
# - /etc/passwd:/etc/passwd:ro
|
# - /etc/passwd:/etc/passwd:ro
|
||||||
|
|
|
@ -21,6 +21,7 @@ UPLOAD_LIMIT=20000000
|
||||||
# ====================================
|
# ====================================
|
||||||
# You should not have to edit any of the following ones:
|
# You should not have to edit any of the following ones:
|
||||||
POSTGRES_HOST=localhost
|
POSTGRES_HOST=localhost
|
||||||
|
DB_DOCKER_IMAGE=postgres:12-alpine
|
||||||
LANG=en_US.UTF-8
|
LANG=en_US.UTF-8
|
||||||
REPLACE_OS_VARS=true
|
REPLACE_OS_VARS=true
|
||||||
LIVEVIEW_ENABLED=true
|
LIVEVIEW_ENABLED=true
|
||||||
|
|
|
@ -21,6 +21,7 @@ UPLOAD_LIMIT=20000000
|
||||||
# ====================================
|
# ====================================
|
||||||
# You should not have to edit any of the following ones:
|
# You should not have to edit any of the following ones:
|
||||||
POSTGRES_HOST=localhost
|
POSTGRES_HOST=localhost
|
||||||
|
DB_DOCKER_IMAGE=postgis/postgis:12-3.1-alpine
|
||||||
LANG=en_US.UTF-8
|
LANG=en_US.UTF-8
|
||||||
REPLACE_OS_VARS=true
|
REPLACE_OS_VARS=true
|
||||||
LIVEVIEW_ENABLED=true
|
LIVEVIEW_ENABLED=true
|
||||||
|
|
|
@ -21,6 +21,7 @@ UPLOAD_LIMIT=20000000
|
||||||
# ====================================
|
# ====================================
|
||||||
# You should not have to edit any of the following ones:
|
# You should not have to edit any of the following ones:
|
||||||
POSTGRES_HOST=localhost
|
POSTGRES_HOST=localhost
|
||||||
|
DB_DOCKER_IMAGE=postgres:12-alpine
|
||||||
LANG=en_US.UTF-8
|
LANG=en_US.UTF-8
|
||||||
REPLACE_OS_VARS=true
|
REPLACE_OS_VARS=true
|
||||||
LIVEVIEW_ENABLED=true
|
LIVEVIEW_ENABLED=true
|
||||||
|
|
|
@ -22,6 +22,7 @@ UPLOAD_LIMIT=20000000
|
||||||
# You should not have to edit any of the following ones:
|
# You should not have to edit any of the following ones:
|
||||||
APP_NAME=reflow
|
APP_NAME=reflow
|
||||||
POSTGRES_HOST=localhost
|
POSTGRES_HOST=localhost
|
||||||
|
DB_DOCKER_IMAGE=postgis/postgis:12-3.1-alpine
|
||||||
LANG=en_US.UTF-8
|
LANG=en_US.UTF-8
|
||||||
REPLACE_OS_VARS=true
|
REPLACE_OS_VARS=true
|
||||||
LIVEVIEW_ENABLED=true
|
LIVEVIEW_ENABLED=true
|
||||||
|
|
Loading…
Reference in a new issue