diff --git a/samples/development-frameworks/SqlServerOnDocker/README.md b/samples/development-frameworks/SqlServerOnDocker/README.md index 83b3eb2f..d49eed8f 100644 --- a/samples/development-frameworks/SqlServerOnDocker/README.md +++ b/samples/development-frameworks/SqlServerOnDocker/README.md @@ -4,11 +4,11 @@ Prof of concept project with Microsoft SQL Server and Django Framework setup on ## To start development: 1. install [docker](https://docs.docker.com/#/components) and [docker-compose](https://docs.docker.com/compose/install/) 2. clone this repository -2. run `docker-compose build db` to build web container +2. run `docker-compose build db` to build db container 2. sudo docker-compose run db sqlcmd -S db1.internal.prod.example.com -U SA -P 'Alaska2017' -Q 'create database docker2;' 3. run `docker-compose up web` to test web and db containers -5. run `docker-compose run web python manage.py migrate` to apply migrations. **Important! all migrations will go to master database unless you create new database and update settings.py files** -6. run `docker-compose run web python manage.py createsuperuser` to create admin account +5. run `docker-compose run web python3 manage.py migrate` to apply migrations. **Important! all migrations will go to master database unless you create new database and update settings.py files** +6. run `docker-compose run web python3 manage.py createsuperuser` to create admin account ## To run project: 1. diff --git a/samples/development-frameworks/SqlServerOnDocker/SqlServerOnDocker/settings.py b/samples/development-frameworks/SqlServerOnDocker/SqlServerOnDocker/settings.py index efd9213d..6c666ab4 100644 --- a/samples/development-frameworks/SqlServerOnDocker/SqlServerOnDocker/settings.py +++ b/samples/development-frameworks/SqlServerOnDocker/SqlServerOnDocker/settings.py @@ -25,7 +25,7 @@ SECRET_KEY = 'd-uguc(o8$i@^ea_+m^tv^_tt7loyf6zf^o3%*ws#zs42_u#(&' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ['*',] # Application definition @@ -78,7 +78,7 @@ WSGI_APPLICATION = 'SqlServerOnDocker.wsgi.application' DATABASES = { 'default': { 'ENGINE': 'sql_server.pyodbc', - 'NAME': 'master', + 'NAME': 'docker2', 'USER': 'sa', 'PASSWORD': 'Alaska2017', 'HOST': 'db1.internal.prod.example.com', diff --git a/samples/development-frameworks/SqlServerOnDocker/docker-compose.yml b/samples/development-frameworks/SqlServerOnDocker/docker-compose.yml index 65537a33..cdc42635 100644 --- a/samples/development-frameworks/SqlServerOnDocker/docker-compose.yml +++ b/samples/development-frameworks/SqlServerOnDocker/docker-compose.yml @@ -29,10 +29,10 @@ services: volumes: - .:/code/ ports: - - "8080:8000" + - "8080:8080" environment: DJANGO_SETTINGS_MODULE: SqlServerOnDocker.settings - command: python3 manage.py runserver 0.0.0.0:8000 + command: python3 manage.py runserver 0.0.0.0:8080 restart: unless-stopped networks: mynetwork: diff --git a/samples/development-frameworks/SqlServerOnDocker/docker/db/Dockerfile b/samples/development-frameworks/SqlServerOnDocker/docker/db/Dockerfile index aa1d6ade..63183a38 100644 --- a/samples/development-frameworks/SqlServerOnDocker/docker/db/Dockerfile +++ b/samples/development-frameworks/SqlServerOnDocker/docker/db/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/mssql-server-linux +FROM microsoft/mssql-server-linux:latest RUN apt-get update && apt-get install -y \ curl \ @@ -7,9 +7,9 @@ RUN apt-get update && apt-get install -y \ # https://docs.microsoft.com/en-us/sql/connect/odbc/linux/installing-the-microsoft-odbc-driver-for-sql-server-on-linux RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - RUN curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list > /etc/apt/sources.list.d/mssql-release.list -RUN apt-get update -RUN ACCEPT_EULA=Y apt-get install -y \ - mssql-tools +#RUN apt-get update +#RUN ACCEPT_EULA=Y apt-get install -y \ +# mssql-tools RUN apt-get install -y locales \ && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ diff --git a/samples/development-frameworks/SqlServerOnDocker/docker/web/Dockerfile b/samples/development-frameworks/SqlServerOnDocker/docker/web/Dockerfile index b5b9f7d0..f907df2b 100644 --- a/samples/development-frameworks/SqlServerOnDocker/docker/web/Dockerfile +++ b/samples/development-frameworks/SqlServerOnDocker/docker/web/Dockerfile @@ -10,7 +10,7 @@ RUN curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list > /etc/apt RUN apt-get update RUN ACCEPT_EULA=Y apt-get install -y \ msodbcsql \ - mssql-tools \ +# mssql-tools \ unixodbc-dev #python part of the game