fixed kpi

Author: skarampatakis

docker-config/kpi/.env

@@ -1,25 +1,27 @@
-APP_ENV=local
+APP_ENV=production
 APP_KEY=base64:77OgH/oKeS0eg4yCcTPDZhmwYExYb7+eVhOXlBGfpo4=
 APP_DEBUG=true
 APP_LOG_LEVEL=debug
-APP_URL=http://localhost
-APP_THEME=default
+APP_URL=http://apps.openbudgets.eu/kpi
+APP_THEME=obeu
 REGISTRATION_ENABLED=false
 VALUE_CACHE=true
-CACHE_TIME=120
+CACHE_TIME=1200000000000
 LANG_DETECTOR_LANGUAGES=en,el
+L5_SWAGGER_BASE_PATH=/kpi/api/v1
 
 
 DB_CONNECTION=sqlite
+DB_DATABASE=/var/www/database/database.sqlite
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=sync
 
-ENDPOINT="http://data.openbudgets.eu/sparql"
-RUDOLF=http://eis-openbudgets.iais.fraunhofer.de/api/3/cubes/
+ENDPOINT=http://data.openbudgets.eu/sparql
+RUDOLF=http://apps.openbudgets.eu/api/3/cubes/
 INDIGO=http://apps.openbudgets.eu/
 INDIGO_ROUTE=#indigo/cube/analytics/
-OS_VIEWER=http://eis-openbudgets.iais.fraunhofer.de/viewer/
+OS_VIEWER=http://apps.openbudgets.eu/viewer/
 GEONAMES_ENDPOINT="http://factforge.net/repositories/ff-news?infer=false&sameAs=false&"

docker-config/kpi/Dockerfile

@@ -41,23 +41,22 @@ ENV APACHE_DOC_ROOT /var/www/KPIs/public/
 ENV APP_DIR /var/www/KPIs
 WORKDIR $APP_DIR
 
-RUN git clone https://github.com/okgreece/KPIs.git $APP_DIR && \
-    git checkout master
+ADD https://api.github.com/repos/okgreece/KPIs/git/refs/heads/master /version.json
+RUN rm -r $APP_DIR
+RUN git clone https://github.com/okgreece/KPIs.git $APP_DIR/
 
-COPY ./.env $APP_DIR/.env
+RUN mkdir -p /root/.composer
+COPY ./prod/apache2.conf /etc/apache2/apache2.conf
+RUN mkdir -p /var/www/database
 RUN composer install
+RUN touch /var/www/database/database.sqlite
+COPY ./.env $APP_DIR/.env
 RUN php artisan key:generate
-RUN touch database/database.sqlite
-RUN php artisan migrate --seed
+RUN php artisan migrate --seed --force
+RUN php artisan l5-swagger:generate
 RUN chmod -R a+rwx $APP_DIR
 
-#COPY ./database.sqlite /database.sqlite
-#RUN chmod a+rwx /database.sqlite
-
 EXPOSE 80
 COPY ./start.sh /start.sh
 COPY ./.env /.env
 CMD ["/bin/sh", "/start.sh"]
-
-
-

docker-config/kpi/database.sqlite

@@ -9,7 +9,7 @@ set -e
 echo "date.timezone = $PHP_TIMEZONE" > /usr/local/etc/php/conf.d/timezone.ini
 
 # Change file permissions of sqlite:
-chmod a+rwx $APP_DIR/storage/database.sqlite
+chown www-data:www-data /var/www/database/database.sqlite
 
 # Configure Apache Document Root
 mkdir -p $APACHE_DOC_ROOT
@@ -22,4 +22,3 @@ echo "</Directory>" >> /etc/apache2/conf-available/document-root-directory.conf
 a2enconf "document-root-directory.conf"
 
 exec "apache2-foreground"
-

docker-config/kpi/start.sh

@@ -15,25 +15,25 @@ server {
     ###################### Include Apps ###########################
 
     include includes/locations/linkedpipes.conf;
-    
+
     include includes/locations/okgr_apps.conf;
 
     include includes/locations/kpi.conf;
-    
+
     # include includes/locations/microsite.conf;
-    
+
     include includes/locations/cors-anywhere.conf;
 
     include includes/locations/os_apps.conf;
 
     include includes/locations/staticfiles.conf;
 
     include includes/locations/dam.conf;
-    
+
     include includes/locations/alignment_http.conf;
-    
+
     include includes/locations/opencpu.conf;
-    
+
     ######################### Lets encrypt ############################
 
     location /.well-known {

docker-config/nginx/conf/includes/http_server_eis_obeu.conf

@@ -1,6 +1,10 @@
 location /kpi/ {
     add_header Strict-Transport-Security "max-age=0; includeSubdomains;";
     add_header Cache-Control "no-store, no-cache, must-revalidate";
-    expires -1; 
+    expires -1;
+    proxy_set_header        Host $host;
+    proxy_set_header        X-Real-IP $remote_addr;
+    proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header        X-Forwarded-Proto $scheme;
     proxy_pass http://kpi:80/;
 }

docker-config/nginx/conf/includes/locations/kpi.conf

@@ -16,6 +16,22 @@ services:
             - OS_API=http://apps.openbudgets.eu/api/3
         env_file:
             - ../.env
+    obeu_microsite:
+        image: openbudgets/microsite
+        build: ./obeu-microsite
+        volumes:
+            - ../volumes/osviewer/themes:/microsite/os_viewer_themes
+            - ../volumes/microsite/data/db.sqlite3:/microsite/db.sqlite3
+        ports:
+            - "8009:8000"
+        links:
+            - os-viewer
+        environment:
+            - OS_VIEWER_THEMES_FOLDER=os_viewer_themes
+            - OS_VIEWER_HOST=http://apps.openbudgets.eu/viewer
+            - OS_API=http://apps.openbudgets.eu/api/3
+        env_file:
+            - ../.env
     silkworkbench:
         image: openbudgets/silkworkbench
         build: ./silkworkbench
@@ -266,16 +282,11 @@ services:
         image: openbudgets/kpi
         build: ./kpi
         volumes:
-            - ../volumes/kpi/database/database.sqlite:/var/www/KPIs/storage/database.sqlite
-            - ./kpi/dev/apache2.conf:/etc/apache2/apache2.conf
+            - ../volumes/kpi/database:/var/www/database
+            #- ./kpi/dev/apache2.conf:/etc/apache2/apache2.conf
+            - ../volumes/kpi/composer:/root/.composer
         ports:
             - "8112:80"
-        links:
-            - rudolf
-            - virtuoso_staging
-            - virtuoso_production
-            - indigo
-            - os-viewer
     damapp:
         image: openbudgets/damapp
         build: ./damapp
@@ -321,6 +332,7 @@ services:
             - rdfbrowser
             - alignment
             - microsite
+            - obeu_microsite
             - damapp
             - opencpu
             - cors

docker-config/prod.yml

@@ -58,7 +58,8 @@ mkdir -p volumes/rdfbrowser/storage
 #KPIs:
 mkdir -p volumes/kpi/logs
 mkdir -p volumes/kpi/database
-#[ ! -f volumes/kpi/database/database.sqlite ] && cp ./docker-config/kpi/database.sqlite ./volumes/kpi/database/database.sqlite
+mkdir -p volumes/kpi/composer
+[ ! -f volumes/kpi/database/database.sqlite ] && cp ./docker-config/kpi/database.sqlite ./volumes/kpi/database/database.sqlite
 
 #opencpu:
 mkdir -p volumes/opencpu/scripts

initVolumes.sh

@@ -1,13 +1,13 @@
 #!/usr/bin/env /bin/sh
 
-git pull origin master
+#git pull origin master
 export COMPOSE_HTTP_TIMEOUT=200
 export GOMAXPROCS=4
 OBEU_WORKDIR=$PWD
 
 # -- build: Only rebuilding Images that have changed
     # -- build: Only rebuilding Images that have changed
 cd $OBEU_WORKDIR/docker-config && \
-docker-compose -f prod.yml up --build -d --remove-orphans
+#docker-compose -f prod.yml up --build -d --remove-orphans
 # For Pulling new Base Images and build from scratch:
-# docker-compose -f prod.yml up --build -d --remove-orphans --force-recreate
+docker-compose -f prod.yml up --build -d --remove-orphans --force-recreate