diff --git a/app.py b/app.py index 16974b0..2e6f351 100644 --- a/app.py +++ b/app.py @@ -37,10 +37,11 @@ def get_ip(): response = urllib.request.urlopen('http://ipinfo.io/json') data = json.load(response) + print(data['ip']) return data['ip'] -REDIRECT_URI_REMOTE = f'http://{get_ip()}:5000/callback' +REDIRECT_URI_REMOTE = f'http://{get_ip()}/callback' REDIRECT_URI = REDIRECT_URI_REMOTE if ENVIRONMENT == 'production' else REDIRECT_URI_LOCAL @@ -347,4 +348,5 @@ def svg_display(): if __name__ == '__main__': + get_ip() app.run(debug=True) diff --git a/docker-compose.yml b/docker-compose.yml index 8639366..8d47ce9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,5 @@ +version: '3.8' + services: infra-test: build: @@ -5,6 +7,19 @@ services: dockerfile: flask.Dockerfile ports: - "5000:5000" + environment: + FLASK_KEY: ${FLASK_KEY} + SPOTIFY_CLIENT_ID: ${SPOTIFY_CLIENT_ID} + SPOTIFY_SECRET_ID: ${SPOTIFY_SECRET_ID} + ENVIRONMENT: ${ENVIRONMENT} + MYSQL_ROOT_PASSWORD: ${ROOT_DB_PASSWORD} + MYSQL_DATABASE: ${DB_NAME} + MYSQL_USER: ${DB_USER} + MYSQL_PASSWORD: ${DB_PASSWORD} + EC2_dbs_IP: ${EC2_dbs_IP} + depends_on: + - database + database: build: context: . @@ -12,7 +27,13 @@ services: ports: - "3306:3306" environment: - - MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} - - MYSQL_DATABASE: ${MYSQL_DATABASE} - - MYSQL_USER: ${MYSQL_USER} - - MYSQL_PASSWORD: ${MYSQL_PASSWORD} \ No newline at end of file + MYSQL_ROOT_PASSWORD: ${ROOT_DB_PASSWORD} + MYSQL_DATABASE: ${DB_NAME} + MYSQL_USER: ${DB_USER} + MYSQL_PASSWORD: ${DB_PASSWORD} + networks: + - app-network + +networks: + app-network: + driver: bridge