From 4e4eb9bfedfcd5d0d7032d8119507e079f2e47ae Mon Sep 17 00:00:00 2001 From: Llloooggg Date: Wed, 18 Aug 2021 18:30:57 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=BA=D0=B0=D0=B7=20=D0=BE=D1=82?= =?UTF-8?q?=20=D0=B4=D0=BE=D0=BA=D0=B5=D1=80=D0=B0=20=D0=B8=20=D1=85=D0=B5?= =?UTF-8?q?=D1=80=D0=BE=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dockerignore | 27 --------------------------- Dockerfile | 25 ------------------------- docker-compose.debug.yml | 17 ----------------- docker-compose.yml | 17 ----------------- runscripts/docker/buildandrun.bat | 7 ------- runscripts/docker/buildandrun.sh | 8 -------- runscripts/heroku/buildandpush.bat | 3 --- runscripts/heroku/buildandpush.sh | 5 ----- runscripts/linux/startserverprod.sh | 8 ++++++++ 9 files changed, 8 insertions(+), 109 deletions(-) delete mode 100644 .dockerignore delete mode 100644 Dockerfile delete mode 100644 docker-compose.debug.yml delete mode 100644 docker-compose.yml delete mode 100644 runscripts/docker/buildandrun.bat delete mode 100755 runscripts/docker/buildandrun.sh delete mode 100644 runscripts/heroku/buildandpush.bat delete mode 100755 runscripts/heroku/buildandpush.sh create mode 100644 runscripts/linux/startserverprod.sh diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 91b39d5..0000000 --- a/.dockerignore +++ /dev/null @@ -1,27 +0,0 @@ -**/__pycache__ -**/.classpath -**/.dockerignore -**/.env -**/.git -**/.gitignore -**/.project -**/.settings -**/.toolstarget -**/.vs -**/.vscode -**/*.*proj.user -**/*.dbmdl -**/*.jfm -**/azds.yaml -**/bin -**/charts -**/docker-compose* -**/compose* -**/Dockerfile* -**/node_modules -**/npm-debug.log -**/obj -**/secrets.dev.yaml -**/values.dev.yaml -README.md -db.sqlite diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index be05d57..0000000 --- a/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -# For more information, please refer to https://aka.ms/vscode-docker-python -FROM python:3.8-slim-buster - -EXPOSE 5000 - -# Keeps Python from generating .pyc files in the container -ENV PYTHONDONTWRITEBYTECODE=1 - -# Turns off buffering for easier container logging -ENV PYTHONUNBUFFERED=1 - -# Install pip requirements -COPY requirements.txt . -RUN python -m pip install -r requirements.txt - -WORKDIR /app -COPY . /app - -# Creates a non-root user with an explicit UID and adds permission to access the /app folder -# For more info, please refer to https://aka.ms/vscode-docker-python-configure-containers -RUN adduser -u 5678 --disabled-password --gecos "" appuser && chown -R appuser /app -USER appuser - -# During debugging, this entry point will be overridden. For more information, please refer to https://aka.ms/vscode-docker-python-debug -CMD ["sh", "-c", "gunicorn --bind 0.0.0.0:$PORT dyxless.__init__:app"] diff --git a/docker-compose.debug.yml b/docker-compose.debug.yml deleted file mode 100644 index dce4868..0000000 --- a/docker-compose.debug.yml +++ /dev/null @@ -1,17 +0,0 @@ -version: '3.4' - -services: - dyxless: - image: dyxless - build: - context: . - dockerfile: ./Dockerfile - command: ["sh", "-c", "pip install debugpy -t /tmp && python /tmp/debugpy --wait-for-client --listen 0.0.0.0:5678 -m flask run --no-debugger --no-reload --host 0.0.0.0 --port 5000"] - ports: - - 5000:5000 - - 5678:5678 - working_dir: /dyxless - volumes: - - ./:/dyxless - environment: - - FLASK_APP=dyxless diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 9dce8c7..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,17 +0,0 @@ -version: '3.4' - -services: - dyxless: - image: dyxless - build: - context: . - dockerfile: ./Dockerfile - ports: - - 5000:5000 - working_dir: /dyxless - volumes: - - ./:/dyxless - environment: - - FLASK_APP=dyxless - - PORT=${PORT} - \ No newline at end of file diff --git a/runscripts/docker/buildandrun.bat b/runscripts/docker/buildandrun.bat deleted file mode 100644 index 2261024..0000000 --- a/runscripts/docker/buildandrun.bat +++ /dev/null @@ -1,7 +0,0 @@ - -@echo off - -set PORT=5000 - -docker-compose build -docker-compose up diff --git a/runscripts/docker/buildandrun.sh b/runscripts/docker/buildandrun.sh deleted file mode 100755 index 675141c..0000000 --- a/runscripts/docker/buildandrun.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -set echo off - -export PORT=5000 - -docker-compose build -docker-compose up diff --git a/runscripts/heroku/buildandpush.bat b/runscripts/heroku/buildandpush.bat deleted file mode 100644 index 1d07d1c..0000000 --- a/runscripts/heroku/buildandpush.bat +++ /dev/null @@ -1,3 +0,0 @@ -docker-compose build -heroku container:push web -a dyxless & ^ -heroku container:release web -a dyxless diff --git a/runscripts/heroku/buildandpush.sh b/runscripts/heroku/buildandpush.sh deleted file mode 100755 index ec067bf..0000000 --- a/runscripts/heroku/buildandpush.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -docker-compose build -heroku container:push web -a dyxless || true -heroku container:release web -a dyxless diff --git a/runscripts/linux/startserverprod.sh b/runscripts/linux/startserverprod.sh new file mode 100644 index 0000000..fb9e709 --- /dev/null +++ b/runscripts/linux/startserverprod.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +set echo off + +export FLASK_APP=dyxless +export FLASK_ENV=development + +gunicorn --bind 0.0.0.0:5000 dyxless.__init__:app