Skip to content

Commit a17b3c6

Browse files
committed
Added a default settings_local for use in the docker image. Tweaked the dockerfile some.
- Legacy-Id: 10435
1 parent d9e2354 commit a17b3c6

2 files changed

Lines changed: 22 additions & 8 deletions

File tree

docker/Dockerfile

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,17 @@ RUN echo "deb http://http.debian.net/debian wheezy-backports main contrib non-fr
2727
# Run apt-get noninteractive
2828
ENV DEBIAN_FRONTEND=noninteractive
2929

30-
# Some basics
31-
RUN apt-get update
32-
RUN apt-get install -qy apt-utils wget less python procps ca-certificates
30+
# Some basic packages we'll need
31+
RUN apt-get update && apt-get install -qy apt-utils wget less python procps ca-certificates awk
3332

3433
# MySQL
35-
RUN apt-get install -qy mysql-server
34+
RUN apt-get update && apt-get install -qy mysql-server
3635

3736
# Subversion
38-
RUN apt-get install -qy subversion/wheezy-backports libsvn1/wheezy-backports
37+
RUN apt-get update && apt-get install -qy subversion/wheezy-backports libsvn1/wheezy-backports
3938

40-
# Some things needed to compile requirements
41-
RUN apt-get install -qy libmysqlclient-dev python-dev libxml2-dev libxslt-dev
39+
# Some packages needed to compile requirements
40+
RUN apt-get update && apt-get install -qy libmysqlclient-dev python-dev libxml2-dev libxslt-dev
4241

4342
# Pip
4443
ENV PYTHONWARNINGS="ignore:a true SSLContext object"
@@ -49,7 +48,6 @@ RUN pip --version
4948
RUN pip install virtualenv
5049

5150
# idnits and dependencies
52-
RUN apt-get install -qy gawk
5351
RUN wget -q -P /usr/local/bin/ https://tools.ietf.org/tools/idnits/idnits
5452
RUN chmod +x /usr/local/bin/idnits
5553

docker/settings_local.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
SECRET_KEY = 'jzv$o93h_lzw4a0%0oz-5t5lk+ai=3f8x@uo*9ahu8w4i300o6'
2+
3+
DATABASES = {
4+
'default': {
5+
'NAME': 'dev_ietf_utf8',
6+
'ENGINE': 'django.db.backends.mysql',
7+
'USER': 'django_dev',
8+
'PASSWORD': 'mJM+#@Fgec',
9+
},
10+
}
11+
12+
DATABASE_TEST_OPTIONS = {
13+
'init_command': 'SET storage_engine=InnoDB',
14+
}
15+
16+
IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits"

0 commit comments

Comments
 (0)