Added a default settings_local for use in the docker image. Tweaked the dockerfile some.

- Legacy-Id: 10435
This commit is contained in:
Henrik Levkowetz 2015-11-06 18:28:43 +00:00
parent d9e2354aa2
commit a17b3c62f5
2 changed files with 22 additions and 8 deletions

View file

@ -27,18 +27,17 @@ RUN echo "deb http://http.debian.net/debian wheezy-backports main contrib non-fr
# Run apt-get noninteractive
ENV DEBIAN_FRONTEND=noninteractive
# Some basics
RUN apt-get update
RUN apt-get install -qy apt-utils wget less python procps ca-certificates
# Some basic packages we'll need
RUN apt-get update && apt-get install -qy apt-utils wget less python procps ca-certificates awk
# MySQL
RUN apt-get install -qy mysql-server
RUN apt-get update && apt-get install -qy mysql-server
# Subversion
RUN apt-get install -qy subversion/wheezy-backports libsvn1/wheezy-backports
RUN apt-get update && apt-get install -qy subversion/wheezy-backports libsvn1/wheezy-backports
# Some things needed to compile requirements
RUN apt-get install -qy libmysqlclient-dev python-dev libxml2-dev libxslt-dev
# Some packages needed to compile requirements
RUN apt-get update && apt-get install -qy libmysqlclient-dev python-dev libxml2-dev libxslt-dev
# Pip
ENV PYTHONWARNINGS="ignore:a true SSLContext object"
@ -49,7 +48,6 @@ RUN pip --version
RUN pip install virtualenv
# idnits and dependencies
RUN apt-get install -qy gawk
RUN wget -q -P /usr/local/bin/ https://tools.ietf.org/tools/idnits/idnits
RUN chmod +x /usr/local/bin/idnits

16
docker/settings_local.py Normal file
View file

@ -0,0 +1,16 @@
SECRET_KEY = 'jzv$o93h_lzw4a0%0oz-5t5lk+ai=3f8x@uo*9ahu8w4i300o6'
DATABASES = {
'default': {
'NAME': 'dev_ietf_utf8',
'ENGINE': 'django.db.backends.mysql',
'USER': 'django_dev',
'PASSWORD': 'mJM+#@Fgec',
},
}
DATABASE_TEST_OPTIONS = {
'init_command': 'SET storage_engine=InnoDB',
}
IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits"