Dockerfiles flyttet til repo rod: Dockerfile_backend + Dockerfile_nginx
- Dockerfiles nu i repo roden så Portainer kan bygge direkte fra Gitea URL - COPY paths opdateret til at inkludere subdirectory (backend/, nginx/) - docker-compose.yml build paths opdateret - README build-kommandoer + Portainer guide + projektstruktur opdateret
This commit is contained in:
@@ -2,9 +2,9 @@ FROM python:3.12-slim
|
|||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY requirements.txt .
|
COPY backend/requirements.txt .
|
||||||
RUN pip install --no-cache-dir -r requirements.txt
|
RUN pip install --no-cache-dir -r requirements.txt
|
||||||
|
|
||||||
COPY app/ ./app/
|
COPY backend/app/ ./app/
|
||||||
|
|
||||||
CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000", "--proxy-headers"]
|
CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000", "--proxy-headers"]
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
FROM nginx:alpine
|
||||||
|
COPY nginx/nginx.conf /etc/nginx/conf.d/default.conf
|
||||||
@@ -27,10 +27,19 @@ Billeder bygges lokalt først, deploy sker via Portainer.
|
|||||||
### Byg lokalt (podman)
|
### Byg lokalt (podman)
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
podman build -t pokedexter-backend:latest -f backend/Dockerfile backend/
|
podman build -t pokedexter-backend:latest -f Dockerfile_backend .
|
||||||
podman build -t pokedexter-nginx:latest -f nginx/Dockerfile nginx/
|
podman build -t pokedexter-nginx:latest -f Dockerfile_nginx .
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Byg fra Gitea (Portainer)
|
||||||
|
|
||||||
|
I Portainer under **Image → Build from repository**:
|
||||||
|
|
||||||
|
| Felt | Værdi |
|
||||||
|
|--------------------|------------------------------------------|
|
||||||
|
| Repository URL | `https://git.itedb.dk/glennigen/pokedexter.git` |
|
||||||
|
| Dockerfile path | `Dockerfile_backend` (eller `Dockerfile_nginx`) |
|
||||||
|
|
||||||
### Start lokalt
|
### Start lokalt
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@@ -239,11 +248,10 @@ Card
|
|||||||
```
|
```
|
||||||
pokedexter/
|
pokedexter/
|
||||||
├── docker-compose.yml
|
├── docker-compose.yml
|
||||||
├── start.sh # podman start
|
├── Dockerfile_backend
|
||||||
├── stop.sh # podman stop
|
├── Dockerfile_nginx
|
||||||
├── README.md
|
├── README.md
|
||||||
├── backend/
|
├── backend/
|
||||||
│ ├── Dockerfile
|
|
||||||
│ ├── requirements.txt
|
│ ├── requirements.txt
|
||||||
│ └── app/
|
│ └── app/
|
||||||
│ ├── main.py # FastAPI app, middleware
|
│ ├── main.py # FastAPI app, middleware
|
||||||
@@ -274,7 +282,7 @@ pokedexter/
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Byg nyt image
|
# Byg nyt image
|
||||||
podman build -t pokedexter-backend:latest -f backend/Dockerfile backend/
|
podman build -t pokedexter-backend:latest -f Dockerfile_backend .
|
||||||
|
|
||||||
# Genstart via Portainer, eller:
|
# Genstart via Portainer, eller:
|
||||||
podman stop pokedexter-backend && podman rm pokedexter-backend
|
podman stop pokedexter-backend && podman rm pokedexter-backend
|
||||||
|
|||||||
+6
-2
@@ -16,7 +16,9 @@ services:
|
|||||||
|
|
||||||
backend:
|
backend:
|
||||||
image: pokedexter-backend:latest
|
image: pokedexter-backend:latest
|
||||||
# build: ./backend
|
# build:
|
||||||
|
# context: .
|
||||||
|
# dockerfile: Dockerfile_backend
|
||||||
container_name: pokedexter-backend
|
container_name: pokedexter-backend
|
||||||
environment:
|
environment:
|
||||||
DATABASE_URL: "postgresql+asyncpg://pokedexter:pokedexter_secret@db/pokedexter"
|
DATABASE_URL: "postgresql+asyncpg://pokedexter:pokedexter_secret@db/pokedexter"
|
||||||
@@ -29,7 +31,9 @@ services:
|
|||||||
|
|
||||||
nginx:
|
nginx:
|
||||||
image: pokedexter-nginx:latest
|
image: pokedexter-nginx:latest
|
||||||
# build: ./nginx
|
# build:
|
||||||
|
# context: .
|
||||||
|
# dockerfile: Dockerfile_nginx
|
||||||
container_name: pokedexter-nginx
|
container_name: pokedexter-nginx
|
||||||
ports:
|
ports:
|
||||||
- "8085:80"
|
- "8085:80"
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
FROM nginx:alpine
|
|
||||||
COPY nginx.conf /etc/nginx/conf.d/default.conf
|
|
||||||
Reference in New Issue
Block a user