Merge branch 'develop' of github.com:ic-labs/django-icekit into develop

Author: Greg Turner

.dockerignore

@@ -9,7 +9,6 @@
 **/requirements-local.txt
 *.egg-info/
 .eggs/
-.git/
 .idea/
 .tox/
 dist/

.editorconfig

@@ -15,9 +15,12 @@ end_of_line = crlf
 indent_size = 2
 indent_style = tab
 
-[*.{py,sh}]
+[*.py]
 indent_style = space
 
+[*.sh]
+indent_style = tab
+
 [*.yml]
 indent_size = 2
 indent_style = space

.gitignore

@@ -9,7 +9,6 @@
 **/requirements-local.txt
 /*.egg-info/
 /.eggs/
-/.git/
 /.idea/
 /.tox/
 /dist/

Dockerfile

@@ -1,8 +1,11 @@
 FROM buildpack-deps:jessie
 
 RUN apt-get update \
+    && apt-get upgrade -y \
     && apt-get install -y --no-install-recommends \
+        apt-transport-https \
         gettext \
+        gnupg2 \
         jq \
         nano \
         nginx \
@@ -12,6 +15,13 @@ RUN apt-get update \
         pv \
     && rm -rf /var/lib/apt/lists/*
 
+RUN echo 'deb https://dl.bintray.com/sobolevn/deb git-secret main' | tee -a /etc/apt/sources.list
+RUN wget -nv -O - https://api.bintray.com/users/sobolevn/keys/gpg/public.key | apt-key add -
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        git-secret \
+    && rm -rf /var/lib/apt/lists/*
+
 ENV NODE_VERSION=4.4.2
 RUN wget -nv -O - "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" | tar -Jx -C /opt/ -f -
 RUN ln -s "/opt/node-v${NODE_VERSION}-linux-x64/bin/node" /usr/local/bin/
@@ -60,6 +70,10 @@ ENV ICEKIT_PROJECT_DIR=/opt/django-icekit/project_template
 ENV PATH=/opt/django-icekit/icekit/bin:$PATH
 ENV PGHOST=postgres
 ENV PGUSER=postgres
+ENV PIP_DISABLE_PIP_VERSION_CHECK=on
+ENV PYTHONDONTWRITEBYTECODE=1
+ENV PYTHONHASHSEED=random
+ENV PYTHONWARNINGS=ignore
 ENV REDIS_ADDRESS=redis:6379
 ENV SUPERVISORD_CONFIG_INCLUDE=supervisord-django.conf
 ENV WAITLOCK_ENABLE=1

README.md

@@ -4,7 +4,7 @@
 [![Requirements Status](https://img.shields.io/requires/github/ic-labs/django-icekit.svg)](https://requires.io/github/ic-labs/django-icekit/requirements/)
 [![Version](https://img.shields.io/pypi/v/django-icekit.svg)](https://pypi.python.org/pypi/django-icekit)
 
-[![Deploy to Docker Cloud](https://files.cloud.docker.com/images/deploy-to-dockercloud.svg)](https://cloud.docker.com/stack/deploy/)
+[![Deploy to Docker Cloud](https://files.cloud.docker.com/images/deploy-to-dockercloud.svg)](https://cloud.docker.com/stack/deploy/?repo=https://github.com/ic-labs/django-icekit/)
 
 ICEkit is a next-generation CMS by [the Interaction Consortium], built on top
 of [django-fluent-pages] and [django-fluent-contents]. See

docker-cloud.yml

@@ -1,11 +1,11 @@
-common:
+celery:
+  command: setup-django.sh celery.sh
   deployment_strategy: high_availability
   environment:
     BASE_SETTINGS_MODULE: production
     # EMAIL_HOST:
     # EMAIL_HOST_PASSWORD:
     # EMAIL_HOST_USER:
-    ICEKIT_PROJECT_DIR: /opt/icekit-project
     # MEDIA_AWS_ACCESS_KEY_ID:
     # MEDIA_AWS_SECRET_ACCESS_KEY:
     # MEDIA_AWS_STORAGE_BUCKET_NAME:
@@ -18,46 +18,87 @@ common:
     # SITE_DOMAIN:
     # SITE_NAME:
   image: interaction/icekit:master
-  volumes:
-    - /opt/icekit-project
-celery:
-  command: setup-django.sh celery.sh
-  extends: common
   links:
     - elasticsearch
-    - postgres
+    # - postgres
     - redis
-  volumes_from:
-    - django
 celerybeat:
   command: setup-django.sh celerybeat.sh
-  extends: common
+  deployment_strategy: high_availability
+  environment:
+    BASE_SETTINGS_MODULE: production
+    # EMAIL_HOST:
+    # EMAIL_HOST_PASSWORD:
+    # EMAIL_HOST_USER:
+    # MEDIA_AWS_ACCESS_KEY_ID:
+    # MEDIA_AWS_SECRET_ACCESS_KEY:
+    # MEDIA_AWS_STORAGE_BUCKET_NAME:
+    # PGDATABASE:
+    # PGHOST:
+    # PGPASSWORD:
+    # PGPORT:
+    # PGUSER:
+    # SENTRY_DSN:
+    # SITE_DOMAIN:
+    # SITE_NAME:
+  image: interaction/icekit:master
   links:
     - redis
-  volumes_from:
-    - django
 celeryflower:
   command: setup-django.sh celeryflower.sh
+  deployment_strategy: high_availability
   environment:
     VIRTUAL_HOST: flower.*
     VIRTUAL_HOST_WEIGHT: 1
-  extends: common
+  environment:
+    BASE_SETTINGS_MODULE: production
+    # EMAIL_HOST:
+    # EMAIL_HOST_PASSWORD:
+    # EMAIL_HOST_USER:
+    # MEDIA_AWS_ACCESS_KEY_ID:
+    # MEDIA_AWS_SECRET_ACCESS_KEY:
+    # MEDIA_AWS_STORAGE_BUCKET_NAME:
+    # PGDATABASE:
+    # PGHOST:
+    # PGPASSWORD:
+    # PGPORT:
+    # PGUSER:
+    # SENTRY_DSN:
+    # SITE_DOMAIN:
+    # SITE_NAME:
   expose:
-    - 5555
+    - "5555"
+  image: interaction/icekit:master
   links:
     - redis
-  volumes_from:
-    - django
 django:
   command: setup-django.sh supervisord.sh
+  deployment_strategy: high_availability
   environment:
     VIRTUAL_HOST: "*"
-  extends: common
+  environment:
+    BASE_SETTINGS_MODULE: production
+    # EMAIL_HOST:
+    # EMAIL_HOST_PASSWORD:
+    # EMAIL_HOST_USER:
+    # MEDIA_AWS_ACCESS_KEY_ID:
+    # MEDIA_AWS_SECRET_ACCESS_KEY:
+    # MEDIA_AWS_STORAGE_BUCKET_NAME:
+    # PGDATABASE:
+    # PGHOST:
+    # PGPASSWORD:
+    # PGPORT:
+    # PGUSER:
+    # SENTRY_DSN:
+    # SITE_DOMAIN:
+    # SITE_NAME:
   expose:
-    - 8000
+    - "8000"
+  image: interaction/icekit:master
   links:
     - elasticsearch
     - celery
+    # - postgres
     - redis
 elasticsearch:
   image: interaction/elasticsearch-icu:1
@@ -71,8 +112,8 @@ haproxy:
     - "443:443"
   roles:
     - global
-postgres:
-  image: onjin/alpine-postgres:9.4
+# postgres:
+#   image: onjin/alpine-postgres:9.4
 redis:
   command: redis-server --appendonly yes
   image: redis:3-alpine

docker-compose.travis.yml

@@ -1,6 +1,7 @@
 django:
   command: runtests.sh
   environment:
+    QUICK: 1
     TRAVIS:
     TRAVIS_BRANCH:
     TRAVIS_JOB_ID:

docker-compose.yml

@@ -13,9 +13,10 @@ services:
     command: setup-django.sh bash.sh
     environment:
       BASE_SETTINGS_MODULE: develop
+      GPG_PASSPHRASE: # Get from environment
       MASTER_PASSWORD: # Get from environment
       TERM: # Get from environment
-    image: interaction/icekit:latest
+    image: interaction/icekit:local
     tmpfs:
       - /tmp
     volumes:

docs/changelog.md

@@ -2,6 +2,16 @@
 
 ## In development
 
+  * Preview pages are now visually highlighted, and have a different HTML title.
+
+  * "Slideshow" is now renamed "Image Gallery" and there is a new Image Gallery
+    content plugin available (which renders a grid of thumbnails into a
+    lightbox).
+
+## 0.15 (27 September 2016)
+
+  * Improvements to publishing to make it accomodate more types of content.
+
   * Fix bug where the content items and placeholders associated with a
     fluent content model (other than a page) were not included in the
     published copy.
@@ -11,6 +21,10 @@
     classes for fluent content models and admins, to help keep things
     DRY.
 
+   * Minor docs on testing.
+
+   * Greater test coverage.
+
 ### Breaking changes
 
   * Import model mixins `FluentFieldsMixin`, `LayoutFieldMixin`, and

docs/howto/deployment.md

@@ -1,4 +1,4 @@
-[![Deploy to Docker Cloud](https://files.cloud.docker.com/images/deploy-to-dockercloud.svg)](https://cloud.docker.com/stack/deploy/)
+[![Deploy to Docker Cloud](https://files.cloud.docker.com/images/deploy-to-dockercloud.svg)](https://cloud.docker.com/stack/deploy/?repo=https://github.com/ic-labs/django-icekit/)
 
 # Deployment