diff --git a/.gitignore b/.gitignore index 280a5ff..73a4c0d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ **.pyc **/__pycache__/** +data/** diff --git a/Dockerfile b/Dockerfile index bd75f88..ef4e732 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,11 @@ +#Download Python from DockerHub and use it FROM python:alpine -ENV PYTHONUNBUFFERED=1 -WORKDIR /powerpanel-webview -COPY requirements.txt /powerpanel-webview/ -RUN pip install -r requirements.txt -COPY . /powerpanel-webview/ +#Set the working directory in the Docker container +WORKDIR /code + +#Copy the dependencies file to the working directory +COPY requirements.txt . + +#Install the dependencies +RUN pip install -r requirements.txt \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index cc18260..4d58202 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,15 +5,18 @@ services: powerpanel-webview: build: . image: powerpanel-webview:latest - command: python manage.py runserver 0.0.0.0:8000 - ports: "8000:8000" - volumes: .:/powerpanel-webview - depends_on: db + command: python /code/app.py + ports: + - "9090:9090" + volumes: + - ./src:/code + depends_on: + - db db: image: postgres:alpine - volumes: ./data/db:/var/lib/postgresql/data + volumes: + - ./data/db:/var/lib/postgresql/data environment: - POSTGRES_DB=powerpanel-db - POSTGRES_USER=postgres - POSTGRES_PASSWORD=1t3ySxqFnqb8KrCAecIHb34v - diff --git a/requirements.txt b/requirements.txt index 32a3b06..2077213 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1 @@ -Django>=3.0 -psycopg2-binary>=2.8 +Flask \ No newline at end of file diff --git a/src/app.py b/src/app.py new file mode 100644 index 0000000..95be2c6 --- /dev/null +++ b/src/app.py @@ -0,0 +1,11 @@ +from flask import Flask +from powerpanel_manage import get_status_dict +app = Flask(__name__) + +@app.route('/') +def main_page(): + status_dict = get_status_dict() + return status_dict + +if __name__ == '__main__': + app.run(host='0.0.0.0', port=9090) diff --git a/powerpanel_manage.py b/src/powerpanel_manage.py similarity index 100% rename from powerpanel_manage.py rename to src/powerpanel_manage.py