From 58cce208745ba2750b6c46c853cca6ad039f3462 Mon Sep 17 00:00:00 2001
From: Nabeel <khnabeelasif@qlik.com>
Date: Wed, 29 Jan 2020 15:24:00 +1100
Subject: [PATCH] Initialization updates for v.6.5

---
 Qlik-Py-Init.bat        |  5 +++--
 Qlik-Py-Init.ps1        |  5 +++--
 docker/Dockerfile v.6.5 | 14 ++++++++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 docker/Dockerfile v.6.5

diff --git a/Qlik-Py-Init.bat b/Qlik-Py-Init.bat
index f856e8e..603ca34 100644
--- a/Qlik-Py-Init.bat
+++ b/Qlik-Py-Init.bat
@@ -13,7 +13,7 @@ cd ..
 echo.
 echo Installing required packages... & echo.
 python -m pip install --upgrade setuptools pip
-pip install grpcio==1.26.0 grpcio-tools==1.26.0 numpy==1.17.5 scipy==1.4.1 pandas==0.25.3 cython==0.29.14 joblib==0.11
+pip install grpcio==1.26.0 grpcio-tools==1.26.0 numpy==1.17.5 scipy==1.4.1 pandas==0.25.3 cython==0.29.14 joblib==0.11 holidays==0.9.11
 pip install pystan==2.17
 pip install fbprophet==0.4.post2
 pip install scikit-learn==0.21.3
@@ -28,5 +28,6 @@ echo.
 echo Creating a new firewall rule for TCP port 50055... & echo.
 netsh advfirewall firewall add rule name="Qlik PyTools" dir=in action=allow protocol=TCP localport=50055
 echo.
-echo All done. Run Qlik-Py-Start.bat to start the SSE Extension Service. & echo.
+echo Setup completed. Please check the log above for errors in red text. & echo.
+echo Run Qlik-Py-Start.bat to start this Server Side Extension. & echo.
 pause
diff --git a/Qlik-Py-Init.ps1 b/Qlik-Py-Init.ps1
index 2e67cf1..1b917c9 100644
--- a/Qlik-Py-Init.ps1
+++ b/Qlik-Py-Init.ps1
@@ -7,7 +7,7 @@ Write-Output "Activating the virtual environment..."
 & $PSScriptRoot\qlik-py-env\Scripts\activate.ps1
 Write-Output "Installing required packages..."
 python -m pip install --upgrade setuptools pip
-pip install grpcio==1.26.0 grpcio-tools==1.26.0 numpy==1.17.5 scipy==1.4.1 pandas==0.25.3 cython==0.29.14 joblib==0.11
+pip install grpcio==1.26.0 grpcio-tools==1.26.0 numpy==1.17.5 scipy==1.4.1 pandas==0.25.3 cython==0.29.14 joblib==0.11 holidays==0.9.11
 pip install pystan==2.17
 pip install fbprophet==0.4.post2
 pip install scikit-learn==0.21.3
@@ -20,4 +20,5 @@ pip install keras==2.2.5
 python -m spacy download en
 Write-Output "Creating a new firewall rule for TCP port 50055..."
 netsh advfirewall firewall add rule name=Qlik-PyTools dir=in action=allow protocol=TCP localport=50055
-Write-Output "All done. Run Qlik-Py-Start.bat to start the SSE Extension Service."
\ No newline at end of file
+Write-Output "Setup completed. Please check the log above for errors in red text."
+Write-Output "Run Qlik-Py-Start.ps1 to start this Server Side Extension."
\ No newline at end of file
diff --git a/docker/Dockerfile v.6.5 b/docker/Dockerfile v.6.5
new file mode 100644
index 0000000..3dbb008
--- /dev/null
+++ b/docker/Dockerfile v.6.5	
@@ -0,0 +1,14 @@
+# Use the previous version of qlik-py-tools as a parent image
+FROM nabeeloz/qlik-py-tools:6.3
+
+# Set the working directory to /qlik-py-tools/core
+WORKDIR /qlik-py-tools/core
+
+# Copy all files from the core subdirectory into the container
+COPY ./core/* /qlik-py-tools/core/
+
+# Make ports 80 and 50055 available to the world outside this container
+EXPOSE 80 50055
+
+# Run __main__.py when the container launches
+CMD ["python", "__main__.py"]
\ No newline at end of file