Merge pull request #285 from Pixilib/dev

Dev

Dockerfile

@@ -1,3 +1,12 @@
+FROM node:14.15.4 as ohif
+RUN apt-get update -qy && \
+    apt-get install -y --no-install-recommends apt-utils\
+    git
+WORKDIR /ohif
+RUN git clone --depth 1 --branch @ohif/viewer@4.9.21 https://github.com/OHIF/Viewers.git
+RUN cd Viewers && yarn install && QUICK_BUILD=true PUBLIC_URL=/ohif/ yarn build
+RUN rm /ohif/Viewers/platform/viewer/dist/app-config.js
+
 FROM php:7.4.1-apache
 
 ENV COMPOSER_ALLOW_SUPERUSER=1
@@ -39,6 +48,7 @@ RUN a2enmod remoteip
 RUN a2enconf gaelo-app
 
 COPY --chown=www-data:www-data src .
+COPY --from=ohif --chown=www-data:www-data /ohif/Viewers/platform/viewer/dist ./ohif/
 RUN composer install --no-dev
 
 RUN service apache2 restart

src/includes/jsLibrairies.php

@@ -121,8 +121,8 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/PapaParse/5.1.0/papaparse.min.js"></script>
 
 <!-- GaelO Uploader -->
-<script src="https://unpkg.com/gaelo-uploader@3.1.9/dist/bundle.js"></script>
-<link rel="stylesheet" href="https://unpkg.com/gaelo-uploader@3.1.9/dist/main.css">
+<script src="https://unpkg.com/gaelo-uploader@3.1.10/dist/bundle.js"></script>
+<link rel="stylesheet" href="https://unpkg.com/gaelo-uploader@3.1.10/dist/main.css">
 
 <script type="text/javascript" src="assets/javascripts/gaelO.js" ></script>
 <link rel="stylesheet" href="assets/css/gaelO-specific.css">

src/includes/jsLibrairies_main.php

@@ -116,8 +116,8 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/PapaParse/5.1.0/papaparse.min.js"></script>
 
 <!-- GaelO Uploader -->
-<script src="https://unpkg.com/gaelo-uploader@3.1.9/dist/bundle.js"></script>
-<link rel="stylesheet" href="https://unpkg.com/gaelo-uploader@3.1.9/dist/main.css">
+<script src="https://unpkg.com/gaelo-uploader@3.1.10/dist/bundle.js"></script>
+<link rel="stylesheet" href="https://unpkg.com/gaelo-uploader@3.1.10/dist/main.css">
 
 <!-- GaelO CSS -->
 <?php $uploaderVersion="3.7"?>

src/index.php

@@ -19,7 +19,7 @@
  * @package     GaelO
  * @author      Salim Kanoun <Salim.Kanoun@gmail.com>
  */
-define('GAELO_VERSION', '1.5.1');
+define('GAELO_VERSION', '1.5.4');
 header('content-type: text/html; charset=utf-8');
 require_once('vendor/autoload.php');
 require 'router.php';