From 5124acaabba19861f469d065b31ee1f041d6f873 Mon Sep 17 00:00:00 2001 From: "M. Eric Irrgang" Date: Wed, 24 Jul 2019 12:27:44 +0300 Subject: [PATCH] Fix gmxapi notebook image and sample_restraint docker build stage. Resolve conflicting logic from upstream merges. Change-Id: I2fb42e602ce73d5849cf435f713f2c35101674e2 --- python_packaging/docker/notebook | 2 +- python_packaging/docker/notebook.dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python_packaging/docker/notebook b/python_packaging/docker/notebook index 1b57ef46cd..2c05f7fbf1 100755 --- a/python_packaging/docker/notebook +++ b/python_packaging/docker/notebook @@ -1,5 +1,5 @@ #!/bin/bash source /usr/local/gromacs/bin/GMXRC -source $HOME/testing/bin/activate +source $VENV/bin/activate jupyter notebook --ip=0.0.0.0 --no-browser --NotebookApp.custom_display_url='http://localhost:8888/' diff --git a/python_packaging/docker/notebook.dockerfile b/python_packaging/docker/notebook.dockerfile index f4cc2b3b0a..d184939579 100644 --- a/python_packaging/docker/notebook.dockerfile +++ b/python_packaging/docker/notebook.dockerfile @@ -19,6 +19,6 @@ FROM gmxapi/ci-mpich:$REF RUN . $VENV/bin/activate && \ pip install --no-cache-dir jupyter -ADD --chown=testing:testing notebook /home/testing/scripts/ +ADD --chown=testing:testing notebook /docker_entry_points CMD ["notebook"] -- 2.11.4.GIT