Skip to content

Commit

Permalink
Merge pull request #56 from diegofcornejo/server
Browse files Browse the repository at this point in the history
feat: Added server as a submodule under ./server and created docker-c…
  • Loading branch information
diegofcornejo authored Sep 16, 2024
2 parents b0da781 + a8acdcd commit e1f9cf7
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "server"]
path = server
url = https://github.com/diegofcornejo/EDOpro-server-ts
1 change: 1 addition & 0 deletions .vercelignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
server
19 changes: 19 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,22 @@ You can check out [the Next.js GitHub repository](https://github.com/vercel/next
The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.

Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.

## Docker Compose
You need to compose the Docker image passing `--env-file .env` used for build arguments in the Dockerfile.

### Just web
```bash
docker compose --env-file .env build --progress plain
# Load env file here is important to pass the build arguments to the Dockerfile from the .env file.

docker compose up
# No need to pass the .env file again, since the environment variables are already defined in the docker-compose.yml, and they will be available during execution.
```

### With server
```bash
docker compose -f docker-compose-with-server.yml --env-file .env build --progress plain
docker compose -f docker-compose-with-server.yml up
```

5 changes: 5 additions & 0 deletions docker-compose-with-server.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: evolutionygo

include:
- path: ./docker-compose.yml
- path: ./server/docker-compose.yaml
3 changes: 1 addition & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
version: '3.8'
name: evolutionygo
name: evolutionygo-web
services:
web:
restart: always
Expand Down
1 change: 1 addition & 0 deletions server
Submodule server added at 2ad353

0 comments on commit e1f9cf7

Please sign in to comment.