Fix gmxapi notebook image and sample_restraint docker build stage.
commit5124acaabba19861f469d065b31ee1f041d6f873
authorM. Eric Irrgang <ericirrgang@gmail.com>
Wed, 24 Jul 2019 09:27:44 +0000 (24 12:27 +0300)
committerMark Abraham <mark.j.abraham@gmail.com>
Wed, 24 Jul 2019 11:30:12 +0000 (24 13:30 +0200)
treec876e70321b2d3abbe855e1f2fa11cd54f65f3ef
parent7cf2886466441c706b486d266fe5896b65385586
Fix gmxapi notebook image and sample_restraint docker build stage.

Resolve conflicting logic from upstream merges.

Change-Id: I2fb42e602ce73d5849cf435f713f2c35101674e2
python_packaging/docker/notebook
python_packaging/docker/notebook.dockerfile