mirror of
https://github.com/linux-odyssey/linux-odyssey.git
synced 2026-11-06 03:20:13 +08:00
fix: remove env_file field but subsistute from shell
This commit is contained in:
1 parent
aac1592957
commit
a79b66ed8d
5 files changed
+23
-4
No files matched your search
@@ -19,6 +19,10 @@ Run everything (frontend, backend, db, swagger, quests):
|
|||||||
docker compose build
|
docker compose build
|
||||||
docker compose up -d
|
docker compose up -d
|
||||||
|
|
||||||
|
If you want to enable social login, you should have OAuth client token in a `.env` file:
|
||||||
|
|
||||||
|
docker compose --env-file .env up -d
|
||||||
|
|
||||||
## Testing
|
## Testing
|
||||||
|
|
||||||
Run Cypress locally, using the current development containers:
|
Run Cypress locally, using the current development containers:
|
||||||
@@ -42,6 +46,17 @@ Run Cypress in container, create brand-new containers along with it:
|
|||||||
docker compose -f docker-compose.prod.yml pull
|
docker compose -f docker-compose.prod.yml pull
|
||||||
docker compose -f docker-compose.prod.yml up -d
|
docker compose -f docker-compose.prod.yml up -d
|
||||||
|
|
||||||
|
To enable social login, you should have OAuth client token in a `.env` file:
|
||||||
|
You can copy from `example.env`
|
||||||
|
|
||||||
|
# .env
|
||||||
|
GOOGLE_CLIENT_ID=...
|
||||||
|
GOOGLE_CLIENT_SECRET=...
|
||||||
|
|
||||||
|
To enable it:
|
||||||
|
|
||||||
|
docker compose --env-file .env -f docker-compose.prod.yml up -d
|
||||||
|
|
||||||
## Standalone App (without Docker)
|
## Standalone App (without Docker)
|
||||||
|
|
||||||
Source: `app/`
|
Source: `app/`
|
||||||
|
|||||||
@@ -41,6 +41,8 @@ services:
|
|||||||
- MONGO_USER=user
|
- MONGO_USER=user
|
||||||
- MONGO_PASS=user-password
|
- MONGO_PASS=user-password
|
||||||
- MONGO_DB=odyssey-test
|
- MONGO_DB=odyssey-test
|
||||||
|
- GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID}
|
||||||
|
- GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET}
|
||||||
|
|
||||||
base:
|
base:
|
||||||
image: lancatlin/linux-odyssey:base
|
image: lancatlin/linux-odyssey:base
|
||||||
|
|||||||
@@ -36,11 +36,11 @@ services:
|
|||||||
- players
|
- players
|
||||||
volumes:
|
volumes:
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
env_file:
|
|
||||||
- .env
|
|
||||||
environment:
|
environment:
|
||||||
- MONGO_URL=mongodb://user:user-password@db-test:27017/odyssey-test
|
- MONGO_URL=mongodb://user:user-password@db-test:27017/odyssey-test
|
||||||
- DOCKER_NETWORK=linux-odyssey-players
|
- DOCKER_NETWORK=linux-odyssey-players
|
||||||
|
- GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID}
|
||||||
|
- GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET}
|
||||||
|
|
||||||
db-test:
|
db-test:
|
||||||
image: mongo
|
image: mongo
|
||||||
|
|||||||
+2
-2
@@ -26,12 +26,12 @@ services:
|
|||||||
- ./server/swagger.yaml:/app/server/swagger.yaml
|
- ./server/swagger.yaml:/app/server/swagger.yaml
|
||||||
- ./packages:/app/packages
|
- ./packages:/app/packages
|
||||||
- ./quests:/app/quests
|
- ./quests:/app/quests
|
||||||
env_file:
|
|
||||||
- .env
|
|
||||||
environment:
|
environment:
|
||||||
- MONGO_URL=mongodb://db:27017/odyssey-test
|
- MONGO_URL=mongodb://db:27017/odyssey-test
|
||||||
- DOCKER_NETWORK=linux-odyssey-players
|
- DOCKER_NETWORK=linux-odyssey-players
|
||||||
- HOST_PWD=${PWD}
|
- HOST_PWD=${PWD}
|
||||||
|
- GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID}
|
||||||
|
- GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET}
|
||||||
db:
|
db:
|
||||||
image: mongo
|
image: mongo
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
@@ -0,0 +1,2 @@
|
|||||||
|
GOOGLE_CLIENT_ID=
|
||||||
|
GOOGLE_CLIENT_SECRET=
|
||||||
Reference in new issue
Block a user