From c62e6e731b3d6aa755a5046f596101c561600e30 Mon Sep 17 00:00:00 2001 From: Dmitriy Shesterkin Date: Fri, 9 Jun 2017 00:53:03 +0300 Subject: [PATCH] add tags --- .dockerignore | 4 ++++ bin/diff_static.sh | 19 ------------------- docker-compose.yml | 4 ++++ 3 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 bin/diff_static.sh diff --git a/.dockerignore b/.dockerignore index d5bdc83..24bb1e5 100644 --- a/.dockerignore +++ b/.dockerignore @@ -7,3 +7,7 @@ /tmp /var /db +/docker-compose.yml +/Dockerfile +/README.md +/db.sqlite3 diff --git a/bin/diff_static.sh b/bin/diff_static.sh deleted file mode 100644 index 26039aa..0000000 --- a/bin/diff_static.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# diff production and development static folders - -ALL=$1 - -PROD_STATIC="_public_html/static" -DEV_STATIC="src/static" - -if [ "$ALL" = "--all" ]; then - EXCLUDE="" -else - EXCLUDE="-x cms -x admin -x admin_tools -x debug_toolbar -x tiny_mce -x filer -x autocomplete_light -x ckeditor - -x ckeditor_plugins -x cmsplugin_filer_folder -x djangocms_admin_style -x djangocms_text_ckeditor - -x cms.ckeditor.css -x cms.ckeditor.js" - echo "# exclude =" ${EXCLUDE} -fi - -diff -q -r ${EXCLUDE} ${PROD_STATIC} ${DEV_STATIC} diff --git a/docker-compose.yml b/docker-compose.yml index 7c2eca8..e4ab328 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,7 @@ version: '2' services: web: restart: always + container_nam e: dokumentor-web build: . volumes: - ./:/opt/app @@ -16,6 +17,7 @@ services: db: restart: always + container_name: dokumentor-db image: postgres:latest expose: - "5432" @@ -27,12 +29,14 @@ services: redis: restart: always + container_name: dokumentor-redis image: redis:alpine expose: - "6379" rabbitmq: restart: always + container_name: dokumentor-rabbitmq image: rabbitmq:alpine environment: - RABBITMQ_DEFAULT_USER=dokumentor