Skip to content

Commit 6844e3e

Browse files
committed
remove mssql-tools from Dockerfile. Latest version of SQL Server on Linux have it already on board.
1 parent 28a6d39 commit 6844e3e

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

samples/development-frameworks/SqlServerOnDocker/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ Prof of concept project with Microsoft SQL Server and Django Framework setup on
44
## To start development:
55
1. install [docker](https://docs.docker.com/#/components) and [docker-compose](https://docs.docker.com/compose/install/)
66
2. clone this repository
7-
2. run `docker-compose build db` to build web container
7+
2. run `docker-compose build db` to build db container
88
2. sudo docker-compose run db sqlcmd -S db1.internal.prod.example.com -U SA -P 'Alaska2017' -Q 'create database docker2;'
99
3. run `docker-compose up web` to test web and db containers
10-
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**
11-
6. run `docker-compose run web python manage.py createsuperuser` to create admin account
10+
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**
11+
6. run `docker-compose run web python3 manage.py createsuperuser` to create admin account
1212

1313
## To run project:
1414
1.

samples/development-frameworks/SqlServerOnDocker/SqlServerOnDocker/settings.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# SECURITY WARNING: don't run with debug turned on in production!
2626
DEBUG = True
2727

28-
ALLOWED_HOSTS = []
28+
ALLOWED_HOSTS = ['*',]
2929

3030

3131
# Application definition
@@ -78,7 +78,7 @@
7878
DATABASES = {
7979
'default': {
8080
'ENGINE': 'sql_server.pyodbc',
81-
'NAME': 'master',
81+
'NAME': 'docker2',
8282
'USER': 'sa',
8383
'PASSWORD': 'Alaska2017',
8484
'HOST': 'db1.internal.prod.example.com',

samples/development-frameworks/SqlServerOnDocker/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ services:
2929
volumes:
3030
- .:/code/
3131
ports:
32-
- "8080:8000"
32+
- "8080:8080"
3333
environment:
3434
DJANGO_SETTINGS_MODULE: SqlServerOnDocker.settings
35-
command: python3 manage.py runserver 0.0.0.0:8000
35+
command: python3 manage.py runserver 0.0.0.0:8080
3636
restart: unless-stopped
3737
networks:
3838
mynetwork:

samples/development-frameworks/SqlServerOnDocker/docker/db/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/mssql-server-linux
1+
FROM microsoft/mssql-server-linux:latest
22

33
RUN apt-get update && apt-get install -y \
44
curl \
@@ -7,9 +7,9 @@ RUN apt-get update && apt-get install -y \
77
# https://docs.microsoft.com/en-us/sql/connect/odbc/linux/installing-the-microsoft-odbc-driver-for-sql-server-on-linux
88
RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
99
RUN curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list > /etc/apt/sources.list.d/mssql-release.list
10-
RUN apt-get update
11-
RUN ACCEPT_EULA=Y apt-get install -y \
12-
mssql-tools
10+
#RUN apt-get update
11+
#RUN ACCEPT_EULA=Y apt-get install -y \
12+
# mssql-tools
1313

1414
RUN apt-get install -y locales \
1515
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \

samples/development-frameworks/SqlServerOnDocker/docker/web/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list > /etc/apt
1010
RUN apt-get update
1111
RUN ACCEPT_EULA=Y apt-get install -y \
1212
msodbcsql \
13-
mssql-tools \
13+
# mssql-tools \
1414
unixodbc-dev
1515

1616
#python part of the game

0 commit comments

Comments
 (0)