Merge pull request #1 from MaastrichtU-CDS/feature/v4support

Feature/v4support

Dockerfile

@@ -1,14 +1,14 @@
 # Basic python3 image as base
-FROM harbor2.vantage6.ai/infrastructure/algorithm-base:3.4.2
+FROM harbor2.vantage6.ai/infrastructure/algorithm-base:4.2
 
+# Change this to the package name of your project. This needs to be the same
+# as what you specified for the name in the `setup.py`.
+ARG PKG_NAME="v6-logistic-regression-py"
 
-# Package name
-ARG PKG_NAME="v6_logistic_regression_py"
-
-# Install federated algorithm
+# This will install your algorithm into this image.
 COPY . /app
 RUN pip install /app
 
-# Tell docker to execute `docker_wrapper()` when the image is run.
+# This will run your algorithm when the Docker container is started.
 ENV PKG_NAME=${PKG_NAME}
-CMD python -c "from vantage6.tools.docker_wrapper import docker_wrapper; docker_wrapper('${PKG_NAME}')"
+CMD python -c "from vantage6.algorithm.tools.wrap import wrap_algorithm; wrap_algorithm()"

setup.py

@@ -16,7 +16,7 @@
 
 # Setup the package
 setup(
-    name='v6_logistic_regression_py',
+    name='v6-logistic-regression-py',
     version='1.0.0',
     description='Vantage6 algorithm for logistic regression',
     long_description=long_description,