Skip to content

Commit 38fade4

Browse files
committed
Config overrides updated with proper defaults for inside the docker-compose network, fixture setup added to docker-command.bash
1 parent 1a027f8 commit 38fade4

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

app/chat/fixtures/initial.json app/app/fixtures/oauth_application.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[
22
{
3-
"model": "oauth2.provider_accesstoken",
3+
"model": "oauth2_provider.application",
44
"pk": 1,
55
"fields": {
6-
"created": "2020-02-29 21:30:30.418260 +00:00",
7-
"updated": "2020-02-29 21:30:30.418279 +00:00",
6+
"created": "2020-02-29 21:30:30Z",
7+
"updated": "2020-02-29 21:30:30Z",
88
"client_id": "VkHFfFlxnVCMYtYCWRxphbvPQUJjmER4cWtwqe7Q",
99
"client_secret": "xhLXNqXnOlkUiGCDFJLxQJjPb3CltLZNFZtzOsLgFfvwbYY60kYWRRBmqyjzfrnNyT6WWdIbfQEPpU854K2UiofmXtybFD1QkfIR9VVQyK3ttJpET7GormIBjK9CQRap",
1010
"redirect_uris": "http://localhost:8065/login/gitcoin/complete http://localhost:8065/signup/gitcoin/complete http://localhost:8065/oauth/gitcoin/complete",

bin/docker-command.bash

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ if [ ! -f /provisioned ] || [ "$FORCE_PROVISION" = "on" ]; then
5656

5757
if [ "$DISABLE_INITIAL_LOADDATA" != "on" ]; then
5858

59+
python3 manage.py loaddata app/fixtures/oauth_application.json
5960
python3 manage.py loaddata app/fixtures/users.json
6061
python3 manage.py loaddata app/fixtures/economy.json
6162
python3 manage.py loaddata app/fixtures/profiles.json

chatconfig/config.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,8 @@
264264
"Id": "VkHFfFlxnVCMYtYCWRxphbvPQUJjmER4cWtwqe7Q",
265265
"Scope": "read",
266266
"AuthEndpoint": "http://localhost:8000/login/github/?next=",
267-
"TokenEndpoint": "http://localhost:8000/o/token/",
268-
"UserApiEndpoint": "http://localhost:8000/api/user/me"
267+
"TokenEndpoint": "http://web:8000/o/token/",
268+
"UserApiEndpoint": "http://web:8000/api/user/me"
269269
},
270270
"GitLabSettings": {
271271
"Enable": true,

0 commit comments

Comments
 (0)