From 5aa3f15a421fb42eed5b1d7acd1e47ec89ead097 Mon Sep 17 00:00:00 2001 From: H4CK3R-01 Date: Mon, 13 Mar 2023 15:03:37 +0100 Subject: [PATCH] Trying to fix pipeline 4 --- .woodpecker.yml | 4 ++-- backend/Dockerfile => Dockerfile.Backend | 4 ++-- Dockerfile.Frontend | 7 +++++++ frontend/Dockerfile | 7 ------- 4 files changed, 11 insertions(+), 11 deletions(-) rename backend/Dockerfile => Dockerfile.Backend (77%) create mode 100644 Dockerfile.Frontend delete mode 100644 frontend/Dockerfile diff --git a/.woodpecker.yml b/.woodpecker.yml index 6656369..a174d20 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -20,7 +20,7 @@ pipeline: # from_secret: registry_password # registry: # from_secret: registry - # dockerfile: ./backend/Dockerfile + # dockerfile: Dockerfile.backend # platforms: linux/amd64 # #when: # # path: "backend/**" @@ -39,7 +39,7 @@ pipeline: from_secret: registry_password registry: from_secret: registry - dockerfile: ./frontend/Dockerfile + dockerfile: Dockerfile.frontend platforms: linux/amd64 #when: # path: "frontend/**" diff --git a/backend/Dockerfile b/Dockerfile.Backend similarity index 77% rename from backend/Dockerfile rename to Dockerfile.Backend index c21de60..d4ebd18 100644 --- a/backend/Dockerfile +++ b/Dockerfile.Backend @@ -1,13 +1,13 @@ FROM python:3.8 WORKDIR /app -ADD requirements.txt /app/requirements.txt +ADD ./backend/requirements.txt /app/requirements.txt RUN pip install --upgrade -r requirements.txt EXPOSE 8080 -COPY ./ /app +COPY ./backend/ /app CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "8080"] diff --git a/Dockerfile.Frontend b/Dockerfile.Frontend new file mode 100644 index 0000000..841c584 --- /dev/null +++ b/Dockerfile.Frontend @@ -0,0 +1,7 @@ +FROM nginx:latest + +COPY ./frontend/index.html /usr/share/nginx/html/index.html +COPY ./frontend/index.css /usr/share/nginx/html/index.css +COPY ./frontend/index.js /usr/share/nginx/html/index.js + +HEALTHCHECK --interval=1m --timeout=3s CMD curl --fail http://localhost/ || exit 1 \ No newline at end of file diff --git a/frontend/Dockerfile b/frontend/Dockerfile deleted file mode 100644 index df5cb54..0000000 --- a/frontend/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM nginx:latest - -COPY ./index.html /usr/share/nginx/html/index.html -COPY ./index.css /usr/share/nginx/html/index.css -COPY ./index.js /usr/share/nginx/html/index.js - -HEALTHCHECK --interval=1m --timeout=3s CMD curl --fail http://localhost/ || exit 1 \ No newline at end of file