diff --git a/backend/Dockerfile b/Dockerfile_backend similarity index 65% rename from backend/Dockerfile rename to Dockerfile_backend index 0f40ae1..7efc0f6 100644 --- a/backend/Dockerfile +++ b/Dockerfile_backend @@ -2,9 +2,9 @@ FROM python:3.12-slim WORKDIR /app -COPY requirements.txt . +COPY backend/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"] \ No newline at end of file diff --git a/Dockerfile_nginx b/Dockerfile_nginx new file mode 100644 index 0000000..475f0b7 --- /dev/null +++ b/Dockerfile_nginx @@ -0,0 +1,2 @@ +FROM nginx:alpine +COPY nginx/nginx.conf /etc/nginx/conf.d/default.conf \ No newline at end of file diff --git a/README.md b/README.md index 8784409..9033566 100644 --- a/README.md +++ b/README.md @@ -27,10 +27,19 @@ Billeder bygges lokalt først, deploy sker via Portainer. ### Byg lokalt (podman) ```bash -podman build -t pokedexter-backend:latest -f backend/Dockerfile backend/ -podman build -t pokedexter-nginx:latest -f nginx/Dockerfile nginx/ +podman build -t pokedexter-backend:latest -f Dockerfile_backend . +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 ```bash @@ -239,11 +248,10 @@ Card ``` pokedexter/ ├── docker-compose.yml -├── start.sh # podman start -├── stop.sh # podman stop +├── Dockerfile_backend +├── Dockerfile_nginx ├── README.md ├── backend/ -│ ├── Dockerfile │ ├── requirements.txt │ └── app/ │ ├── main.py # FastAPI app, middleware @@ -274,7 +282,7 @@ pokedexter/ ```bash # 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: podman stop pokedexter-backend && podman rm pokedexter-backend diff --git a/docker-compose.yml b/docker-compose.yml index c3d789c..239016c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,9 @@ services: backend: image: pokedexter-backend:latest -# build: ./backend +# build: +# context: . +# dockerfile: Dockerfile_backend container_name: pokedexter-backend environment: DATABASE_URL: "postgresql+asyncpg://pokedexter:pokedexter_secret@db/pokedexter" @@ -29,7 +31,9 @@ services: nginx: image: pokedexter-nginx:latest -# build: ./nginx +# build: +# context: . +# dockerfile: Dockerfile_nginx container_name: pokedexter-nginx ports: - "8085:80" diff --git a/nginx/Dockerfile b/nginx/Dockerfile deleted file mode 100644 index afc6a5d..0000000 --- a/nginx/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM nginx:alpine -COPY nginx.conf /etc/nginx/conf.d/default.conf \ No newline at end of file