Correctly Configured Dockerfile and Some Changes in development_settings file

CONTRIBUTING.md

@@ -13,7 +13,7 @@ Please note we have a code of conduct, please follow it in all your interactions
    variables, exposed ports, useful file locations and container parameters.
 3. Increase the version numbers in all version.py files to the new version that this
    Pull Request would represent. The versioning scheme (see next section)
-4. Crate a Pull Request towards the "development" branch, ensure that your pull-request 
+4. Create a Pull Request towards the "development" branch, ensure that your pull-request 
    has at least 80% test-coverage and the Pull Request does not show issues in Travis 
 5. Once the Pull Request is reviewed it will be merged by one of the core developers
 

Dockerfile

@@ -1,13 +1,38 @@
 FROM python:3.6
 
+ENV PYTHONUNBUFFERED=1
+
+
 WORKDIR /app
 
 # Intall dependencies
 COPY /requirements/development_requirements.txt /app/
 COPY /requirements/base_requirements.txt /app/
-
 COPY . /app
 
-RUN chmod +x /app/entrypoint.sh
-ENTRYPOINT ["/app/entrypoint.sh"]
+# Install dependencies
+RUN pip install -r base_requirements.txt
+
+# Install FOP 2.2
+RUN wget https://storage.googleapis.com/server8koalixnet_backup/fop-2.2-bin.tar.gz
+RUN tar -xzf fop-2.2-bin.tar.gz -C ../usr/bin
+RUN ls 
+RUN rm -rf fop-2.2-bin.tar.gz
+RUN chmod 755 /usr/bin/fop-2.2/fop/fop
+
+# Install Java 8
+RUN wget https://storage.googleapis.com/server8koalixnet_backup/jdk-8u181-linux-x64.tar.gz
+RUN tar -xzf jdk-8u181-linux-x64.tar.gz -C ../usr/bin
+RUN rm -rf jdk-8u181-linux-x64.tar.gz
+
+# Create /media/uploads/ directory which is required by django filebrowser
+RUN mkdir -p projectsettings/media/uploads
+RUN chmod -R 755 projectsettings/media
+
+# Create /static/pdf for FOP PDF export
+RUN mkdir -p projectsettings/static/pdf
+RUN chmod -R 755 projectsettings/static/pdf
+
+# Execute startup scripts
+RUN python manage.py collectstatic --noinput --settings=projectsettings.settings.development_settings
 

Dockerfile.prod

@@ -1,12 +1,38 @@
 FROM python:3.6
 
+ENV PYTHONUNBUFFERED=1
+
+
 WORKDIR /app
 
 # Intall dependencies
+COPY /requirements/development_requirements.txt /app/
 COPY /requirements/base_requirements.txt /app/
-
 COPY . /app
 
-RUN chmod +x /app/entrypoint.prod.sh
-ENTRYPOINT ["/app/entrypoint.prod.sh"]
+# Install dependencies
+RUN pip install -r base_requirements.txt
+
+# Install FOP 2.2
+RUN wget https://storage.googleapis.com/server8koalixnet_backup/fop-2.2-bin.tar.gz
+RUN tar -xzf fop-2.2-bin.tar.gz -C ../usr/bin
+RUN ls 
+RUN rm -rf fop-2.2-bin.tar.gz
+RUN chmod 755 /usr/bin/fop-2.2/fop/fop
+
+# Install Java 8
+RUN wget https://storage.googleapis.com/server8koalixnet_backup/jdk-8u181-linux-x64.tar.gz
+RUN tar -xzf jdk-8u181-linux-x64.tar.gz -C ../usr/bin
+RUN rm -rf jdk-8u181-linux-x64.tar.gz
+
+# Create /media/uploads/ directory which is required by django filebrowser
+RUN mkdir -p projectsettings/media/uploads
+RUN chmod -R 755 projectsettings/media
+
+# Create /static/pdf for FOP PDF export
+RUN mkdir -p projectsettings/static/pdf
+RUN chmod -R 755 projectsettings/static/pdf
+
+# Execute startup scripts
+RUN python manage.py collectstatic --noinput --settings=projectsettings.settings.development_settings
 

docker-compose.prod.yml

@@ -6,8 +6,8 @@ services:
   koalixcrm:
     image: koalixswitzerland/koalixcrm:1.12.dev6
     environment:
-      - DJANGO_SETTINGS_MODULE=projectsettings.settings.production_settings
-      - JAVA_HOME=/usr/bin/jdk1.8.0_162/jre
+      - DJANGO_SETTINGS_MODULE=projectsettings.settings.development_sqlite_settings
+      - JAVA_HOME=/usr/bin/jdk1.8.0_181/jre
     ports:
       - "8000:8000"
     depends_on:

docker-compose.yml

@@ -1,14 +1,20 @@
-version: '2.0'
+version: '3'
 
 services:
   db:
     image: postgres
+    environment:
+      POSTGRES_PASSWORD: postgres
+
   koalixcrm:
     build: .
     environment:
       - DJANGO_SETTINGS_MODULE=projectsettings.settings.development_settings
-      - JAVA_HOME=/usr/bin/jdk1.8.0_162/jre
+      - JAVA_HOME=/usr/bin/jdk1.8.0_181/jre
+    command: bash -c "python manage.py migrate --settings=projectsettings.settings.development_settings && python manage.py runserver 0.0.0.0:8000 --settings=projectsettings.settings.development_settings"
+    volumes: 
+      - .:/app/
     ports:
       - "8000:8000"
-    depends_on:
+    depends_on: 
       - db

projectsettings/settings/development_settings.py

@@ -9,12 +9,13 @@
         'ENGINE': 'django.db.backends.postgresql',
         'NAME': 'postgres',
         'USER': 'postgres',
+        'PASSWORD':'postgres',
         'HOST': 'db',
         'PORT': 5432,
     }
 }
 
-FOP_EXECUTABLE = "/usr/bin/fop"
+FOP_EXECUTABLE = "/usr/bin/fop-2.2/fop/fop"
 GRAPPELLI_INDEX_DASHBOARD = 'projectsettings.dashboard.CustomIndexDashboard'
 
 KOALIXCRM_REST_API_AUTH = False

projectsettings/settings/development_sqlite_settings.py

@@ -15,7 +15,7 @@
     }
 }
 
-FOP_EXECUTABLE = "C:/Users/ria/Downloads/fop-2.3/fop/fop.cmd"
+FOP_EXECUTABLE = "/usr/bin/fop-2.2/fop/fop"
 GRAPPELLI_INDEX_DASHBOARD = 'projectsettings.dashboard.CustomIndexDashboard'
 
 KOALIXCRM_REST_API_AUTH = True

projectsettings/settings/production_settings.py

@@ -10,6 +10,7 @@
         'ENGINE': 'django.db.backends.postgresql',
         'NAME': 'postgres',
         'USER': 'postgres',
+        'PASSWORD':'postgres',
         'HOST': 'db',
         'PORT': 5432,
     }