Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Git
.git
.gitignore

# Angular
angularFe/node_modules
angularFe/dist
angularFe/.angular

# .NET
fullstack2026BE/bin
fullstack2026BE/obj
fullstack2026BE/**/bin
fullstack2026BE/**/obj

# Misc
**/.DS_Store
**/*.user
README.md
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ All services communicate over an isolated Docker bridge network (`app-network`).

- [Docker](https://www.docker.com/) & Docker Compose v2+
- A `.env` file in the project root (see below)
- Database with correct name needs to be created on first docker compose

---

Expand Down Expand Up @@ -69,6 +70,7 @@ Starts the full stack with **hot reload** on the Angular frontend and Swagger ac

```bash
docker compose up --build
docker compose -f docker-compose.yml -f docker-compose.prod.yml up --build -d
```

| Service | URL |
Expand Down Expand Up @@ -134,8 +136,6 @@ docker compose logs -f
# Stop all services
docker compose down

# Stop and remove volumes (⚠️ deletes DB data)
docker compose down -v

# Rebuild a single service
docker compose up --build backend
Expand Down
9 changes: 0 additions & 9 deletions angularFe/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
# Dev stage - hot reload via ng serve
FROM node:20-alpine AS dev
WORKDIR /app
COPY package*.json ./
RUN npm install
COPY . .
EXPOSE 4200
CMD ["npx", "ng", "serve", "--host", "0.0.0.0"]

# Build stage - compiled output for prod
FROM node:20-alpine AS build
WORKDIR /app
Expand Down
30 changes: 28 additions & 2 deletions angularFe/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
],
"styles": [
"@angular/material/prebuilt-themes/azure-blue.css",
"src/styles.css"
"src/styles/styles.scss"
],
"scripts": []
},
Expand Down Expand Up @@ -87,12 +87,38 @@
],
"styles": [
"@angular/material/prebuilt-themes/azure-blue.css",
"src/styles.css"
"src/styles/styles.scss"
],
"scripts": []
}
}
}
}
},
"schematics": {
"@schematics/angular:component": {
"type": "component"
},
"@schematics/angular:directive": {
"type": "directive"
},
"@schematics/angular:service": {
"type": "service"
},
"@schematics/angular:guard": {
"typeSeparator": "."
},
"@schematics/angular:interceptor": {
"typeSeparator": "."
},
"@schematics/angular:module": {
"typeSeparator": "."
},
"@schematics/angular:pipe": {
"typeSeparator": "."
},
"@schematics/angular:resolver": {
"typeSeparator": "."
}
}
}
Loading
Loading