Remove Docker and Docker Componse files. These files now live in https://gitlab.com/mayan-edms/mayan-edms-docker.

.dockerignore

@@ -1,2 +0,0 @@
-*
-!docker

Dockerfile

@@ -1,40 +0,0 @@
-FROM ubuntu:15.04
-
-MAINTAINER Roberto Rosario "roberto.rosario@mayan-edms.com"
-
-# Install base Ubuntu libraries
-RUN apt-get update && apt-get install -y netcat-openbsd python-dev python-pip gpgv nginx libpq-dev git-core libjpeg-dev libmagic1 libpng-dev libreoffice libtiff-dev gcc ghostscript gpgv tesseract-ocr unpaper poppler-utils && apt-get clean && rm -rf /var/lib/apt/lists/* && rm -f /var/cache/apt/archives/*.deb
-
-ENV MAYAN_INSTALL_DIR=/usr/local/lib/python2.7/dist-packages/mayan
-
-# Install Mayan EDMS, latest production release
-RUN pip install mayan-edms==2.0.0
-
-# Install Python clients for PostgreSQL, REDIS, and uWSGI
-RUN pip install psycopg2 redis uwsgi
-
-# Create Mayan EDMS basic settings/local.py file
-RUN mayan-edms.py createsettings
-
-# Install Mayan EDMS static media files
-RUN mayan-edms.py collectstatic --noinput
-
-ADD docker /docker
-
-# Setup Mayan EDMS settings file overrides
-RUN cat /docker/conf/mayan/settings.py >> $MAYAN_INSTALL_DIR/settings/local.py
-
-# Setup NGINX
-RUN rm /etc/nginx/sites-enabled/default
-RUN ln -s /docker/conf/nginx/mayan-edms /etc/nginx/sites-enabled/mayan-edms
-
-# Setup UWSGI
-RUN mkdir /var/log/uwsgi
-
-# Persistent Mayan EDMS files
-VOLUME $MAYAN_INSTALL_DIR/media
-
-ENTRYPOINT ["/docker/entrypoint.sh"]
-
-EXPOSE 80
-CMD ["/docker/bin/run.sh"]

HISTORY.rst

@@ -8,6 +8,7 @@
 - Don't store empty metadata value if the update checkbox is not checked.
 - Add 2 second delay to document version tests to workaround MySQL limitation.
 - Strip HTML tags from the browser title.
+- Remove Docker and Docker Compose files.
 
 2.0.1 (2016-01-22)
 ==================

docker-compose.yml

@@ -1,21 +0,0 @@
-postgres:
-    env_file:
-        - ./environment
-    image: postgres
-    volumes:
-        - /var/lib/postgresql/data
-
-redis:
-    image: redis
-
-mayan-edms:
-    env_file:
-        - ./environment
-    image: mayanedms/monolithic
-    links:
-        - postgres
-        - redis
-    ports:
-        - "80:80"
-    volumes:
-        - /usr/local/lib/python2.7/dist-packages/mayan/media

docker/bin/run.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Launch NGINX daemon
-nginx
-
-# Launch the workers
-mayan-edms.py celery worker --settings=mayan.settings.production -Ofair -l ERROR -B &
-
-# Launch uWSGI in foreground
-/usr/local/bin/uwsgi --ini /docker/conf/uwsgi/uwsgi.ini

docker/conf/mayan/settings.py

@@ -1,15 +0,0 @@
-import os
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': os.environ.get('POSTGRES_DB'),
-        'USER': os.environ.get('POSTGRES_USER'),
-        'PASSWORD': os.environ.get('POSTGRES_PASSWORD'),
-        'HOST': os.environ.get('POSTGRES_PORT_5432_TCP_ADDR'),
-        'PORT': os.environ.get('POSTGRES_PORT_5432_TCP_PORT'),
-    }
-}
-
-BROKER_URL = 'redis://{}:{}/0'.format(os.environ.get('REDIS_PORT_6379_TCP_ADDR'),  os.environ.get('REDIS_PORT_6379_TCP_PORT'))
-CELERY_RESULT_BACKEND = 'redis://{}:{}/0'.format(os.environ.get('REDIS_PORT_6379_TCP_ADDR'),  os.environ.get('REDIS_PORT_6379_TCP_PORT'))

docker/conf/nginx/mayan-edms

@@ -1,22 +0,0 @@
-server {
-    listen 80;
-    server_name localhost;
-
-    location / {
-        include uwsgi_params;
-        uwsgi_pass unix:/run/mayan.sock;
-
-        client_max_body_size 30M;  # Increse if your plan to upload bigger documents
-        proxy_read_timeout 30s;  # Increase if your document uploads take more than 30 seconds
-    }
-
-    location /static {
-        alias /usr/local/lib/python2.7/dist-packages/mayan/media/static;
-        expires 1h;
-    }
-
-    location /favicon.ico {
-        alias /usr/local/lib/python2.7/dist-packages/mayan/media/static/appearance/images/favicon.ico;
-        expires 1h;
-    }
-}

docker/conf/uwsgi/uwsgi.ini

@@ -1,14 +0,0 @@
-[uwsgi]
-chdir = $(MAYAN_INSTALL_DIR)
-chmod-socket = 664
-chown-socket = www-data:www-data
-env = DJANGO_SETTINGS_MODULE=mayan.settings.production
-gid = root
-logto = /var/log/uwsgi/%n.log
-pythonpath = /usr/local/lib/python2.7/dist-packages
-master = True
-max-requests = 5000
-socket = /run/mayan.sock
-uid = root
-vacuum = True
-wsgi-file = $(MAYAN_INSTALL_DIR)/wsgi.py

docker/entrypoint.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-set -e
-
-if [[ -z $POSTGRES_PORT_5432_TCP_ADDR ]]; then
-  echo "** ERROR: You need to link the Postgres container."
-  exit 1
-fi
-
-until nc -z $POSTGRES_PORT_5432_TCP_ADDR $POSTGRES_PORT_5432_TCP_PORT; do
-    echo "$(date) - waiting for Postgres..."
-    sleep 1
-done
-
-# Migrate database, create initial admin user
-mayan-edms.py initialsetup
-
-exec "$@"

docs/releases/2.0.2.rst

@@ -21,6 +21,10 @@ Fix empty optional lookup metadata fields behavior
 An edge case was fixed that caused validation to be executed for empty metadata
 fields that had a value lookup list.
 
+Remove Docker files
+-------------------
+Included Docker and Docker Compose files were removed since the Mayan EDMS Docker
+(https://gitlab.com/mayan-edms/mayan-edms-docker) repository is stable.
 
 Other changes
 -------------

environment

@@ -1,3 +0,0 @@
-POSTGRES_DB=mayan
-POSTGRES_PASSWORD=mayanpassword
-POSTGRES_USER=mayan