Skip to content

Commit

Permalink
Fix stripe currency bug in dev environment
Browse files Browse the repository at this point in the history
  • Loading branch information
BerglundDaniel committed Nov 15, 2023
1 parent de3ed2c commit 77a048c
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
1 change: 1 addition & 0 deletions api/src/service/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ def __init__(self, name=None, **kwargs):
HOST_PUBLIC="",
STRIPE_PRIVATE_KEY=None,
STRIPE_SIGNING_SECRET=None,
STRIPE_CURRENCY=None,
APP_DEBUG=None,
CORS_ALLOWED_ORIGINS="https://medlem.makerspace.se,https://stockholm.makeradmin.se,https://medlem.dev.makerspace.se"
",http://localhost:8009,http://localhost:8011,http://localhost:8080",
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@ services:
DEV_RUN: "true"
TEST_SERVICE_TOKEN:


email-dispatcher:
volumes:
- ./api/src:/work/src

accessy-syncer:
volumes:
- ./api/src:/work/src

public:
build:
args:
Expand All @@ -47,6 +48,5 @@ services:
- ./admin/src:/work/src
- ./admin/dist:/work/dist


volumes:
logs:
10 changes: 6 additions & 4 deletions docker-compose.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
- logs:/var/www/html/storage/logs
ports:
- "3307:3306"

api:
volumes:
- logs:/work/logs
Expand All @@ -16,10 +16,11 @@ services:
CORS_ALLOWED_ORIGINS: 'http://admin,http://api,http://public'
TEST_SERVICE_TOKEN:


public:
environment:
HOST_BACKEND: 'http://api'

admin:
environment:
HOST_BACKEND: 'http://api'
Expand All @@ -34,11 +35,11 @@ services:
- /dev/shm:/dev/shm

email-dispatcher:
command: ['/bin/sleep', '3600']
command: [ '/bin/sleep', '3600' ]
environment:
MAILGUN_DOMAIN: ""
MAILGUN_KEY: ""

test:
image: makeradmin/test:1.0
build:
Expand Down Expand Up @@ -70,6 +71,7 @@ services:
APIGATEWAY: "api"
STRIPE_PRIVATE_KEY:
STRIPE_PUBLIC_KEY:
STRIPE_CURRENCY:
TEST_PARALELLISM:
SELENIUM_BASE_TIMEOUT:
SELENIUM_SCREENSHOT_DIR: "/work/.test/selenium-screenshots"
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,12 @@ services:
ACCESSY_SPECIAL_LABACCESS_GROUP:
ACCESSY_DO_MODIFY:


email-dispatcher:
image: makeradmin/api:1.0
build:
context: ./api
command:
command:
- "/work/dispatch_emails.sh"
environment:
MYSQL_HOST: db2
Expand All @@ -83,7 +84,7 @@ services:
image: makeradmin/api:1.0
build:
context: ./api
command:
command:
- "/work/accessy_syncer.sh"
environment:
MYSQL_HOST: db2
Expand All @@ -107,7 +108,6 @@ services:
networks:
- makeradmin


public:
image: makeradmin/public:1.0
volumes:
Expand Down

0 comments on commit 77a048c

Please sign in to comment.