mirror of
https://github.com/jaypyles/Scraperr.git
synced 2025-12-12 02:35:43 +00:00
fix: project structure
This commit is contained in:
10
Dockerfile
10
Dockerfile
@@ -6,7 +6,7 @@ RUN python -m pip --no-cache-dir install pdm
|
|||||||
RUN pdm config python.use_venv false
|
RUN pdm config python.use_venv false
|
||||||
|
|
||||||
COPY pyproject.toml pdm.lock /project/app/
|
COPY pyproject.toml pdm.lock /project/app/
|
||||||
COPY ./api/backend/ /project/app/backend
|
COPY ./api/ /project/app/api
|
||||||
|
|
||||||
WORKDIR /project/app
|
WORKDIR /project/app
|
||||||
RUN pdm install
|
RUN pdm install
|
||||||
@@ -34,12 +34,12 @@ FROM python:3.10-slim
|
|||||||
ENV PYTHONPATH=/project/pkgs
|
ENV PYTHONPATH=/project/pkgs
|
||||||
COPY --from=pybuilder /usr/local/lib/python3.10/site-packages /usr/local/lib/python3.10/site-packages
|
COPY --from=pybuilder /usr/local/lib/python3.10/site-packages /usr/local/lib/python3.10/site-packages
|
||||||
COPY --from=pybuilder /usr/local/bin /usr/local/bin
|
COPY --from=pybuilder /usr/local/bin /usr/local/bin
|
||||||
COPY --from=pybuilder /project/app /project/api
|
COPY --from=pybuilder /project/app /project/
|
||||||
COPY --from=jsbuilder /app/dist /project/api/dist
|
COPY --from=jsbuilder /app/dist /project/dist
|
||||||
|
|
||||||
EXPOSE 8000
|
EXPOSE 8000
|
||||||
|
|
||||||
WORKDIR /project/api
|
WORKDIR /project/
|
||||||
|
|
||||||
CMD [ "pdm", "run", "python", "-m", "uvicorn", "backend.app:app", "--reload", "--host", "0.0.0.0", "--port", "8000"]
|
CMD [ "pdm", "run", "python", "-m", "uvicorn", "api.backend.app:app", "--reload", "--host", "0.0.0.0", "--port", "8000"]
|
||||||
|
|
||||||
|
|||||||
@@ -29,4 +29,4 @@ def read_root():
|
|||||||
|
|
||||||
@app.get("/api/endpoint")
|
@app.get("/api/endpoint")
|
||||||
async def test_endpoint():
|
async def test_endpoint():
|
||||||
return {"hello": "world"}
|
return "Hello World!"
|
||||||
|
|||||||
@@ -19,15 +19,15 @@ services:
|
|||||||
- "--providers.docker=true"
|
- "--providers.docker=true"
|
||||||
- "--entrypoints.web.address=:80"
|
- "--entrypoints.web.address=:80"
|
||||||
- "--entrypoints.websecure.address=:443"
|
- "--entrypoints.websecure.address=:443"
|
||||||
- "--providers.file.filename=/etc/traefik/dynamic_conf.yaml"
|
# - "--providers.file.filename=/etc/traefik/dynamic_conf.yaml"
|
||||||
ports:
|
ports:
|
||||||
- 80:80
|
- 80:80
|
||||||
- 443:443
|
- 443:443
|
||||||
volumes:
|
volumes:
|
||||||
- "/var/run/docker.sock:/var/run/docker.sock:ro"
|
- "/var/run/docker.sock:/var/run/docker.sock:ro"
|
||||||
- "./dynamic_conf.yaml:/etc/traefik/dynamic_conf.yaml"
|
# - "./dynamic_conf.yaml:/etc/traefik/dynamic_conf.yaml"
|
||||||
- "/etc/letsencrypt/live/domain/fullchain.pem:/etc/certs/ssl-cert.pem"
|
# - "/etc/letsencrypt/live/domain/fullchain.pem:/etc/certs/ssl-cert.pem"
|
||||||
- "/etc/letsencrypt/live/domain/privkey.pem:/etc/certs/ssl-cert.key"
|
# - "/etc/letsencrypt/live/domain/privkey.pem:/etc/certs/ssl-cert.key"
|
||||||
networks:
|
networks:
|
||||||
- web
|
- web
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
Reference in New Issue
Block a user