Skip to content

Commit

Permalink
[MINOR] Update docker images organization
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Baunsgaard committed Aug 8, 2020
1 parent 8c385bf commit 7af2ae0
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/action/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
#
#-------------------------------------------------------------

FROM sebaba/testingsysds:2.0
FROM systemds/testingsysds:latest
8 changes: 4 additions & 4 deletions docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
# docker system prune
26 changes: 26 additions & 0 deletions docker/push.sh
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions src/test/scripts/installDependencies.R
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ custom_install("sigmoid");
custom_install("DescTools");
custom_install("mice");
custom_install("mclust");
custom_install("dbscan");

print("Installation Done")

Expand Down

0 comments on commit 7af2ae0

Please # to comment.