diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 94515f8807..0000000000 --- a/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!docker diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 587fe9f65f..0000000000 --- a/Dockerfile +++ /dev/null @@ -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"] diff --git a/HISTORY.rst b/HISTORY.rst index 0d971dc058..93cee24ac2 100644 --- a/HISTORY.rst +++ b/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) ================== diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 371f567166..0000000000 --- a/docker-compose.yml +++ /dev/null @@ -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 diff --git a/docker/bin/run.sh b/docker/bin/run.sh deleted file mode 100755 index ad74092f90..0000000000 --- a/docker/bin/run.sh +++ /dev/null @@ -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 diff --git a/docker/conf/mayan/settings.py b/docker/conf/mayan/settings.py deleted file mode 100644 index 50b90ae9bc..0000000000 --- a/docker/conf/mayan/settings.py +++ /dev/null @@ -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')) diff --git a/docker/conf/nginx/mayan-edms b/docker/conf/nginx/mayan-edms deleted file mode 100644 index 3522f55517..0000000000 --- a/docker/conf/nginx/mayan-edms +++ /dev/null @@ -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; - } -} diff --git a/docker/conf/uwsgi/uwsgi.ini b/docker/conf/uwsgi/uwsgi.ini deleted file mode 100644 index 6e2e1ff95f..0000000000 --- a/docker/conf/uwsgi/uwsgi.ini +++ /dev/null @@ -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 diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh deleted file mode 100755 index 13fe1f395a..0000000000 --- a/docker/entrypoint.sh +++ /dev/null @@ -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 "$@" diff --git a/docs/releases/2.0.2.rst b/docs/releases/2.0.2.rst index 5470fac574..a4378ba89e 100644 --- a/docs/releases/2.0.2.rst +++ b/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 ------------- diff --git a/environment b/environment deleted file mode 100644 index 2ef2c9d6c2..0000000000 --- a/environment +++ /dev/null @@ -1,3 +0,0 @@ -POSTGRES_DB=mayan -POSTGRES_PASSWORD=mayanpassword -POSTGRES_USER=mayan