radarsys_met Commit - r300:c6aee8aed3f9

Update docker configurations

jespinoza -

r300:c6aee8aed3f9

parent child

Context file:

r300:c6aee8aed3f9

Collapse all files

.env +3 -2

-            HOST_REDIS=radarsys-redis
+            REDIS_HOST=radarsys-redis
+            REDIS_PORT=6379
             POSTGRES_DB_NAME=radarsys
             POSTGRES_PORT_5432_TCP_ADDR=radarsys-postgres
             POSTGRES_PORT_5432_TCP_PORT=5432
             POSTGRES_USER=docker
             POSTGRES_PASSWORD=docker
             PGDATA=/var/lib/postgresql/data
-            LC_ALL=C.UTF-8
  No newline at end of file
+            LC_ALL=C.UTF-8

Dockerfile 0 -3

             FROM python:2.7-slim
             # set working directory
             RUN mkdir /radarsys
             WORKDIR /radarsys
             # Install python dependences
             ADD requirements.txt ./requirements.txt
             RUN apt-get clean && apt-get update && apt-get install -y --no-install-recommends \
             	gcc \
                 g++ \
                 && pip install -v --timeout 120 -r requirements.txt --no-cache-dir --index-url http://10.10.20.128:8010/simple --trusted-host 10.10.20.128 \
                 && apt-get purge -y --auto-remove gcc g++\
             	&& rm -rf /var/lib/apt/lists/*
             # Copy the main application.
             COPY . ./
             EXPOSE 8000
-            RUN python manage.py collectstatic --noinput

docker-compose.yml +1 -5

             version: '2'
             services:
              # Django app
               web:
                 container_name: 'radarsys'
                 build: .
                 restart: always
                 image: radarsys
                 command: gunicorn radarsys.wsgi:application -w 2 -b :8000
                 env_file: .env
                 links:
                   - redis
                   - postgres
                 volumes:
                   - './:/radarsys'
                   - '/data/dockers/radarsys/static:/radarsys/static'
                 depends_on:
                   - redis
                   - postgres
               redis:
                 container_name: 'radarsys-redis'
                 image: 'redis:3.2-alpine'
-                ports:
-                  - '127.0.0.1:6300:6379'
                 volumes:
                   - '/data/dockers/radarsys/redis:/data'
               celery_worker:
                 container_name: 'radarsys-celery'
                 image: radarsys
                 env_file: .env
                 command: celery -A radarsys worker -l info
                 volumes_from:
                   - web
                 depends_on:
                   - web
               # PostgreSQL
               postgres:
                 container_name: 'radarsys-postgres'
                 build: ./postgres/
-                ports:
-                  - 5432:5432
                 volumes:
                   - ./postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
                   - pgdata:/var/lib/postgresql/data
                 env_file: .env
               # Web Server
               nginx:
                 container_name: 'radarsys-nginx'
                 restart: always
                 build: ./nginx/
                 ports:
                   - '8030:8030'
                 volumes_from:
                   - web
                 links:
                   - web:web
                 depends_on:
                   - web
             volumes:
               pgdata:
-                driver: local
  No newline at end of file
+                driver: local

postgres/docker-entrypoint-initdb.d/create_db.sh +4 -2

@@ -1,3 +1,5
1	#!/bin/env bash	1	#!/bin/env bash
2	psql -U postgres -c "CREATE USER $POSTGRES_USER PASSWORD '$POSTGRES_PASSWORD'"	2	echo "Creating database..."
3	psql -U postgres -c "CREATE DATABASE $POSTGRES_DB_NAME OWNER $POSTGRES_USER" No newline at end of file	3	psql -U postgres -c "CREATE USER $POSTGRES_USER WITH PASSWORD '$POSTGRES_PASSWORD'; CREATE ROLE "
		4	psql -U postgres -c "CREATE DATABASE $POSTGRES_DB_NAME; CREATE DATABASE "
		5	psql -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE $POSTGRES_DB_NAME to $POSTGRES_USER; GRANT "

radarsys/settings.py +4 -3

             """
             Django settings for radarsys project.
             Generated by 'django-admin startproject' using Django 1.8.6.
             For more information on this file, see
             https://docs.djangoproject.com/en/1.8/topics/settings/
             For the full list of settings and their values, see
             https://docs.djangoproject.com/en/1.8/ref/settings/
             """
             # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
             import os
             BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
             # Quick-start development settings - unsuitable for production
             # See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/
             # SECURITY WARNING: keep the secret key used in production secret!
             SECRET_KEY = 'xshb$k5fc-+j16)cvyffj&9u__0q3$l!hieh#+tbzqg)*f^km0'
             # SECURITY WARNING: don't run with debug turned on in production!
             DEBUG = True
             ALLOWED_HOSTS = ['*']
             # Application definition
             INSTALLED_APPS = (
                 'django.contrib.admin',
                 'django.contrib.auth',
                 'django.contrib.contenttypes',
                 'django.contrib.sessions',
                 'django.contrib.messages',
                 'django.contrib.staticfiles',
                 'bootstrap3',
                 'polymorphic',
                 'apps.accounts',
                 'apps.main',
                 'apps.misc',
                 'apps.rc',
                 'apps.dds',
                 'apps.jars',
                 'apps.usrp',
                 'apps.abs',
                 'apps.cgs',
             )
             MIDDLEWARE_CLASSES = (
                 'django.contrib.sessions.middleware.SessionMiddleware',
                 'django.middleware.common.CommonMiddleware',
                 'django.middleware.csrf.CsrfViewMiddleware',
                 'django.contrib.auth.middleware.AuthenticationMiddleware',
                 'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
                 'django.contrib.messages.middleware.MessageMiddleware',
                 'django.middleware.clickjacking.XFrameOptionsMiddleware',
                 'django.middleware.security.SecurityMiddleware',
             )
             ROOT_URLCONF = 'radarsys.urls'
             TEMPLATES = [
                 {
                     'BACKEND': 'django.template.backends.django.DjangoTemplates',
                     'DIRS': [os.path.join(BASE_DIR, "templates").replace('\\', '/'),],
                     'APP_DIRS': True,
                     'OPTIONS': {
                         'context_processors': [
                             'django.template.context_processors.debug',
                             'django.template.context_processors.request',
                             'django.contrib.auth.context_processors.auth',
                             'django.contrib.messages.context_processors.messages',
                         ],
                     },
                 },
             ]
             WSGI_APPLICATION = 'radarsys.wsgi.application'
             # Database
             # https://docs.djangoproject.com/en/1.8/ref/settings/#databases
             DATABASES = {
                 'default': {
                     'ENGINE': 'django.db.backends.postgresql_psycopg2',
                     'NAME': os.environ.get('POSTGRES_DB_NAME', 'radarsys'),
                     'USER': os.environ.get('POSTGRES_USER', 'docker'),
                     'PASSWORD': os.environ.get('POSTGRES_PASSWORD', 'docker'),
                     'HOST': os.environ.get('POSTGRES_PORT_5432_TCP_ADDR', 'postgres'),
                     'PORT': os.environ.get('POSTGRES_PORT_5432_TCP_PORT', ''),
                 }
             }
             # Internationalization
             # https://docs.djangoproject.com/en/1.8/topics/i18n/
             LANGUAGE_CODE = 'en-us'
             TIME_ZONE = None
             USE_I18N = True
             USE_L10N = True
             USE_TZ = False
             # Static files (CSS, JavaScript, Images)
             # https://docs.djangoproject.com/en/1.8/howto/static-files/
             MEDIA_URL = '/media/'
             MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
             STATIC_URL = '/static/'
             STATIC_ROOT = os.path.join(BASE_DIR, 'static')
             STATICFILES_FINDERS = (
                 'django.contrib.staticfiles.finders.FileSystemFinder',
                 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
             )
             # Celery stuff
-            REDIS_HOST = os.environ.get('HOST_REDIS', '127.0.0.1')
+            REDIS_HOST = os.environ.get('REDIS_HOST', '127.0.0.1')
+            REDIS_PORT = os.environ.get('REDIS_PORT', 6379)
             BROKER_TRANSPORT = 'redis'
-            BROKER_URL = 'redis://%s:6379/0' % REDIS_HOST
+            BROKER_URL = 'redis://{}:{}/0'.format(REDIS_HOST, REDIS_PORT)
-            CELERY_RESULT_BACKEND = 'redis://%s:6379/0' % REDIS_HOST
+            CELERY_RESULT_BACKEND = 'redis://{}:{}/0'.format(REDIS_HOST, REDIS_PORT)
             CELERY_BROKER_TRANSPORT = BROKER_URL
             CELERY_ACCEPT_CONTENT = ['application/json']
             CELERY_TASK_SERIALIZER = 'json'
             CELERY_RESULT_SERIALIZER = 'json'
             CELERY_TIMEZONE = 'America/Lima'

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages