Skip to content
Snippets Groups Projects
Commit 4f640756 authored by lwm's avatar lwm
Browse files

Merge branch 'add-gitlab-configuration' into 'staging'

Add the gitlab configuration.

See merge request aptivate/internewshid!56
parents 309e9e58 6e2147a9
No related branches found
No related tags found
1 merge request!56Add the gitlab configuration.
Pipeline #1864 passed with warnings
...@@ -17,11 +17,12 @@ variables: ...@@ -17,11 +17,12 @@ variables:
before_script: before_script:
- pip install -U pipenv setuptools pip - pip install -U pipenv setuptools pip
- ln -srf internewshid/local_settings.py.dev internewshid/local_settings.py - ln -srf internewshid/local_settings.py.gitlab internewshid/local_settings.py
- | - |
echo "SECRET_KEY = '$DJANGO_SECRET_KEY'" >> internewshid/private_settings.py echo "SECRET_KEY = '$DJANGO_SECRET_KEY'" >> internewshid/private_settings.py
echo "DB_PASSWORD = '$MYSQL_ROOT_PASSWORD'" >> internewshid/private_settings.py echo "DB_PASSWORD = '$MYSQL_ROOT_PASSWORD'" >> internewshid/private_settings.py
- pipenv install --dev --two --deploy - pipenv install --dev --two --deploy
- apt update && apt install -y node-less
checks: checks:
stage: checks stage: checks
......
from __future__ import unicode_literals, absolute_import
import private_settings
DEBUG = True
ASSETS_DEBUG = DEBUG
ASSETS_AUTO_BUILD = DEBUG
DJANGOJS_DEBUG = DEBUG
DEPLOY_ENV = "localdev"
DEPLOY_ENV_NAME = "Local dev copy"
DEPLOY_ENV_COLOR = '#ff9900'
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.mysql',
'NAME': 'internewshid',
'USER': 'root',
'PASSWORD': private_settings.DB_PASSWORD,
'HOST': 'mysql',
'PORT': '3306',
'TEST': {
'CHARSET': 'utf8',
'COLLATION': 'utf8_general_ci',
}
}
}
EMAIL_HOST = 'localhost'
SITE_HOSTNAME = 'localhost:8000'
CACHES = {
'default': {
'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
}
}
# -*- coding: utf-8 -*-
# Generated by Django 1.11.15 on 2018-09-11 13:14
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('users', '0002_auto_20150820_1634'),
]
operations = [
migrations.AlterField(
model_name='user',
name='business_email',
field=models.EmailField(max_length=254, unique=True, verbose_name=b'Email'),
),
]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment