From 7af2ae04f28ddcb36158719a25a7fa34b22d3266 Mon Sep 17 00:00:00 2001
From: baunsgaard <baunsgaard@tugraz.at>
Date: Sat, 8 Aug 2020 09:46:41 +0200
Subject: [PATCH] [MINOR] Update docker images organization

Changes the docker images to use the docker organization systemds
add install dependency for R dbScan
Change the tests to use the new organizations docker images

Closes #1008
---
 .github/action/Dockerfile              |  2 +-
 docker/build.sh                        |  8 ++++----
 docker/push.sh                         | 26 ++++++++++++++++++++++++++
 src/test/scripts/installDependencies.R |  1 +
 4 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100755 docker/push.sh

diff --git a/.github/action/Dockerfile b/.github/action/Dockerfile
index 36420da4b54..7e824741ff2 100644
--- a/.github/action/Dockerfile
+++ b/.github/action/Dockerfile
@@ -19,4 +19,4 @@
 #
 #-------------------------------------------------------------
 
-FROM sebaba/testingsysds:2.0
+FROM systemds/testingsysds:latest
diff --git a/docker/build.sh b/docker/build.sh
index 643813ebb10..9655ba0c492 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -23,13 +23,13 @@
 # Build the docker containers
 
 # The first build is for running systemds through docker.
-docker image build -f docker/sysds.Dockerfile -t sebaba/sysds:2.0 .
+docker image build -f docker/sysds.Dockerfile -t systemds/sysds:latest .
 
 # The second build is for testing systemds. This image installs the R dependencies needed to run the tests.
-docker image build -f docker/testsysds.Dockerfile -t sebaba/testingsysds:2.0 .
+docker image build -f docker/testsysds.Dockerfile -t systemds/testingsysds:latest .
 
 # The third build is python docker for systemds. 
-docker image build -f docker/pythonsysds.Dockerfile -t sebaba/pythonsysds:2.0 .
+docker image build -f docker/pythonsysds.Dockerfile -t systemds/pythonsysds:latest .
 
 # You might want to prune the docker system afterwards using
-# docker system prune
\ No newline at end of file
+# docker system prune
diff --git a/docker/push.sh b/docker/push.sh
new file mode 100755
index 00000000000..b669c919cfb
--- /dev/null
+++ b/docker/push.sh
@@ -0,0 +1,26 @@
+#/bin/bash 
+#-------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#-------------------------------------------------------------
+
+
+docker push systemds/sysds:latest
+docker push systemds/testingsysds:latest
+docker push systemds/pythonsysds:latest
diff --git a/src/test/scripts/installDependencies.R b/src/test/scripts/installDependencies.R
index 46963614db6..2198b6e241f 100644
--- a/src/test/scripts/installDependencies.R
+++ b/src/test/scripts/installDependencies.R
@@ -56,6 +56,7 @@ custom_install("sigmoid");
 custom_install("DescTools");
 custom_install("mice");
 custom_install("mclust");
+custom_install("dbscan");
 
 print("Installation Done")