Merge branch 'master' into add-shell-scripts-lint
This commit is contained in:
commit
22c44ad199
|
@ -22,7 +22,7 @@ services:
|
||||||
accounts:
|
accounts:
|
||||||
# uncomment "build" and comment out "image" to build from sources
|
# uncomment "build" and comment out "image" to build from sources
|
||||||
# build: https://github.com/SkynetLabs/skynet-accounts.git#main
|
# build: https://github.com/SkynetLabs/skynet-accounts.git#main
|
||||||
image: skynetlabs/skynet-accounts:1.1.0
|
image: skynetlabs/skynet-accounts:1.1.1
|
||||||
container_name: accounts
|
container_name: accounts
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
logging: *default-logging
|
logging: *default-logging
|
||||||
|
@ -59,47 +59,22 @@ services:
|
||||||
# build:
|
# build:
|
||||||
# context: https://github.com/SkynetLabs/webportal-accounts-dashboard.git#main
|
# context: https://github.com/SkynetLabs/webportal-accounts-dashboard.git#main
|
||||||
# dockerfile: Dockerfile
|
# dockerfile: Dockerfile
|
||||||
image: skynetlabs/webportal-accounts-dashboard:0.1.0
|
image: skynetlabs/webportal-accounts-dashboard:1.1.0
|
||||||
container_name: dashboard
|
container_name: dashboard
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
logging: *default-logging
|
logging: *default-logging
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
environment:
|
environment:
|
||||||
- NEXT_PUBLIC_PORTAL_DOMAIN=${PORTAL_DOMAIN}
|
- GATSBY_PORTAL_DOMAIN=${PORTAL_DOMAIN}
|
||||||
- NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=${STRIPE_PUBLISHABLE_KEY}
|
- GATSBY_STRIPE_PUBLISHABLE_KEY=${STRIPE_PUBLISHABLE_KEY}
|
||||||
volumes:
|
volumes:
|
||||||
- ./docker/data/dashboard/.next:/usr/app/.next
|
- ./docker/data/dashboard/.cache:/usr/app/.cache
|
||||||
|
- ./docker/data/dashboard/public:/usr/app/public
|
||||||
networks:
|
networks:
|
||||||
shared:
|
shared:
|
||||||
ipv4_address: 10.10.10.85
|
ipv4_address: 10.10.10.85
|
||||||
expose:
|
expose:
|
||||||
- 3000
|
- 9000
|
||||||
depends_on:
|
depends_on:
|
||||||
- mongo
|
- mongo
|
||||||
|
|
||||||
# Do not build dashboard-v2 until we're ready to make a switch
|
|
||||||
# ============================================================
|
|
||||||
# dashboard-v2:
|
|
||||||
# build:
|
|
||||||
# context: https://github.com/SkynetLabs/webportal-accounts-dashboard.git#main
|
|
||||||
# dockerfile: Dockerfile
|
|
||||||
# image: skynetlabs/webportal-accounts-dashboard@1.0.1
|
|
||||||
# container_name: dashboard-v2
|
|
||||||
# restart: unless-stopped
|
|
||||||
# logging: *default-logging
|
|
||||||
# env_file:
|
|
||||||
# - .env
|
|
||||||
# environment:
|
|
||||||
# - GATSBY_PORTAL_DOMAIN=${PORTAL_DOMAIN}
|
|
||||||
# - GATSBY_STRIPE_PUBLISHABLE_KEY=${STRIPE_PUBLISHABLE_KEY}
|
|
||||||
# volumes:
|
|
||||||
# - ./docker/data/dashboard-v2/.cache:/usr/app/.cache
|
|
||||||
# - ./docker/data/dashboard-v2/public:/usr/app/public
|
|
||||||
# networks:
|
|
||||||
# shared:
|
|
||||||
# ipv4_address: 10.10.10.86
|
|
||||||
# expose:
|
|
||||||
# - 9000
|
|
||||||
# depends_on:
|
|
||||||
# - mongo
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ services:
|
||||||
pinner:
|
pinner:
|
||||||
# uncomment "build" and comment out "image" to build from sources
|
# uncomment "build" and comment out "image" to build from sources
|
||||||
# build: https://github.com/SkynetLabs/pinner.git#main
|
# build: https://github.com/SkynetLabs/pinner.git#main
|
||||||
image: skynetlabs/pinner:0.1.0
|
image: skynetlabs/pinner:0.3.0
|
||||||
container_name: pinner
|
container_name: pinner
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
logging: *default-logging
|
logging: *default-logging
|
||||||
|
|
|
@ -59,7 +59,7 @@ services:
|
||||||
# build:
|
# build:
|
||||||
# context: https://github.com/SkynetLabs/webportal-nginx.git#main
|
# context: https://github.com/SkynetLabs/webportal-nginx.git#main
|
||||||
# dockerfile: Dockerfile
|
# dockerfile: Dockerfile
|
||||||
image: skynetlabs/webportal-nginx:0.1.1
|
image: skynetlabs/webportal-nginx:0.2.0
|
||||||
container_name: nginx
|
container_name: nginx
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
logging: *default-logging
|
logging: *default-logging
|
||||||
|
|
Reference in New Issue