diff --git a/Dockerfile b/Dockerfile index b6ed051..089e871 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ -FROM python:3.6.5 -WORKDIR /app +FROM python:3.7.8 +WORKDIR /app_python COPY ./ ./ RUN pip install -r requirements.txt EXPOSE 5000 -CMD ["uwsgi", "--ini", "/app/app.ini"] \ No newline at end of file +# CMD ["uwsgi", "--ini", "/app/app.ini"] +CMD ["python", "flask_hello_world.py"] diff --git a/docker-compose.yml b/docker-compose.yml index d191b91..080fc6f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,26 +1,41 @@ -version: '3.3' +version: "3.3" services: - web: - image: nginx:1.16.0-alpine - ports: - - "80:80" - volumes: - - ./nginx:/etc/nginx/conf.d - uwsgi: + # web: + # image: nginx:1.16.0-alpine + # ports: + # - "80:80" + # volumes: + # - ./nginx:/etc/nginx/conf.d + # uwsgi: + # build: . + # environment: + # DB_HOST: db + # DB_NAME: cloudfun + # DB_USER: cloudfun + # DB_PASS: cloudfun + python: build: . - environment: - DB_HOST: db - DB_NAME: cloudfun - DB_USER: cloud - DB_PASS: fun - db: - image: mysql:5.7 - environment: - MYSQL_DATABASE: cloudfun - MYSQL_USER: cloud - MYSQL_PASSWORD: fun - MYSQL_ROOT_PASSWORD: cloudfun ports: - - "3306:3306" - volumes: - - ./database:/docker-entrypoint-initdb.d + - 5000:5000 + # image: python:3.7.8 + # container_name: python3.7.8 + # volumes: + # - ./:/app_python + # tty: true + # depends_on: + # - db + # db: + # image: mysql:5.7 + # environment: + # MYSQL_DATABASE: cloudfun + # MYSQL_USER: cloudfun + # MYSQL_PASSWORD: cloudfun + # MYSQL_ROOT_PASSWORD: cloudfun + # ports: + # - "3306:3306" + # volumes: + # - ./database:/docker-entrypoint-initdb.d + # - mysql_data_volume:/var/lib/mysql + # command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci +volumes: + mysql_data_volume: diff --git a/flask_hello_world.py b/flask_hello_world.py new file mode 100644 index 0000000..bc56bdc --- /dev/null +++ b/flask_hello_world.py @@ -0,0 +1,12 @@ +import flask + +app = flask.Flask(__name__) + + +@app.route('/') +def index(): + return "Hello, World" + + +if __name__ == '__main__': + app.run(debug=True, host='0.0.0.0') diff --git a/requirements.txt b/requirements.txt index e96ae9b..e79b54c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,5 +7,5 @@ MarkupSafe==1.1.1 mysql-connector-python==8.0.16 protobuf==3.9.0 six==1.12.0 -uWSGI==2.0.18 +# uWSGI==2.0.18 Werkzeug==0.15.5