diff options
author | thecharlesblake | 2018-10-13 15:04:00 +0100 |
---|---|---|
committer | thecharlesblake | 2018-10-13 15:11:38 +0100 |
commit | 9dffb204bb5968d25720364bf9a5993ab58178c8 (patch) | |
tree | 727213e1e1f3c352646fb2a678a7c04ea42f6eaa | |
parent | Add docker to project (diff) | |
download | metasol-9dffb204bb5968d25720364bf9a5993ab58178c8.tar.gz metasol-9dffb204bb5968d25720364bf9a5993ab58178c8.zip |
Fix broken docker setup
-rw-r--r-- | README.md | 5 | ||||
-rwxr-xr-x | docker-install.sh | 11 |
2 files changed, 12 insertions, 4 deletions
@@ -26,6 +26,11 @@ _Dockerfile_ should be a good guide to the required dependencies, although bear in mind that on older Linux systems the required versions of dependencies may not be available through _rpm_ / _deb_. +(Note: on one system I had to run `sudo usermod -aG docker $USER` +and then restart my machine before docker would allow me sufficient +permissions. Just making a note of this here in case others encounter a similar +problem) + ## Using the Docker image To use the docker image, simply run: diff --git a/docker-install.sh b/docker-install.sh index 18d6ab5..9438c5d 100755 --- a/docker-install.sh +++ b/docker-install.sh @@ -1,12 +1,15 @@ #!/bin/bash +docker login + # Downloads the image -docker pull thecharlesblake/solvitiare:1.0 +docker pull thecharlesblake/solvitaire:1.0 # If the cmake-build-[debug/release] folders don't exist, copies pre-generated # versions from the docker image into the current directory (so new users # don't have to wait for a long build to complete!) -if [ ! -d "cmake-build-release" && ! -d "cmake-build-debug" ]; then - docker run -i -v ${PWD}:/.install --rm solvitaire:1.0 \ - bash -c "cp -r ../.install/* ." +if [ ! -d "cmake-build-release" ] && [ ! -d "cmake-build-debug" ]; then + docker run -i -v ${PWD}:/home/Solvitaire --rm \ + thecharlesblake/solvitaire:1.0 bash -c \ + "cp -r ../.install/cmake-build-* ." fi |