Message ID | 569EC536.9020006@sonymobile.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Thanks, applied. On Wed, Jan 20, 2016 at 2:22 AM, Tim Bird <tim.bird@sonymobile.com> wrote: > The docker-create-containter.sh script has an extra 't' in the name. > Fix this, and fix the README and install docs to match the name change. > > Signed-off-by: Tim Bird <tim.bird@sonymobile.com> > --- > README | 2 +- > docs/source/install.tex | 4 ++-- > jta-host-scripts/docker-create-container.sh | 10 ++++++++++ > jta-host-scripts/docker-create-containter.sh | 10 ---------- > 4 files changed, 13 insertions(+), 13 deletions(-) > create mode 100755 jta-host-scripts/docker-create-container.sh > delete mode 100755 jta-host-scripts/docker-create-containter.sh > > diff --git a/README b/README > index c853f4d..8d50828 100644 > --- a/README > +++ b/README > @@ -10,7 +10,7 @@ Running > > -------------------------------------------------------------------------------- > Issue the following commands from top directory: > > -jta-host-scripts/docker-create-containter.sh > +jta-host-scripts/docker-create-container.sh > jta-host-scripts/docker-start-container.sh > > Web interface will be available at http://localhost:8080 > diff --git a/docs/source/install.tex b/docs/source/install.tex > index 9a89849..ccfa1ad 100644 > --- a/docs/source/install.tex > +++ b/docs/source/install.tex > @@ -13,8 +13,8 @@ > > Simply run install.sh script. It will create a docker image with JTA > installed. When it's done you should create and start a docker container > running the following commands from top directory: > \begin{itemize} > -\item \texttt{jta-host-scripts/docker-create-containter.sh}. > -\item \texttt{jta-host-scripts/docker-start-containter.sh}. > +\item \texttt{jta-host-scripts/docker-create-container.sh}. > +\item \texttt{jta-host-scripts/docker-start-container.sh}. > \end{itemize} > > When container is started, JTA web interface will be available on local > machine at port \href{http://localhost:8080}{8080}. > diff --git a/jta-host-scripts/docker-create-container.sh > b/jta-host-scripts/docker-create-container.sh > new file mode 100755 > index 0000000..17c3e8c > --- /dev/null > +++ b/jta-host-scripts/docker-create-container.sh > @@ -0,0 +1,10 @@ > +#!/bin/bash > +SOURCE="${BASH_SOURCE[0]}" > +while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer > a symlink > + DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" > + SOURCE="$(readlink "$SOURCE")" > + [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a > relative symlink, we need to resolve it relative to the path where the > symlink file was located > +done > +DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" > + > +sudo docker create -it -v $DIR/../userdata:/userdata --net="host" jta > diff --git a/jta-host-scripts/docker-create-containter.sh > b/jta-host-scripts/docker-create-containter.sh > deleted file mode 100755 > index 17c3e8c..0000000 > --- a/jta-host-scripts/docker-create-containter.sh > +++ /dev/null > @@ -1,10 +0,0 @@ > -#!/bin/bash > -SOURCE="${BASH_SOURCE[0]}" > -while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer > a symlink > - DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" > - SOURCE="$(readlink "$SOURCE")" > - [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a > relative symlink, we need to resolve it relative to the path where the > symlink file was located > -done > -DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" > - > -sudo docker create -it -v $DIR/../userdata:/userdata --net="host" jta > -- > 1.9.1 > >
diff --git a/README b/README index c853f4d..8d50828 100644 --- a/README +++ b/README @@ -10,7 +10,7 @@ Running -------------------------------------------------------------------------------- Issue the following commands from top directory: -jta-host-scripts/docker-create-containter.sh +jta-host-scripts/docker-create-container.sh jta-host-scripts/docker-start-container.sh Web interface will be available at http://localhost:8080 diff --git a/docs/source/install.tex b/docs/source/install.tex index 9a89849..ccfa1ad 100644 --- a/docs/source/install.tex +++ b/docs/source/install.tex @@ -13,8 +13,8 @@ Simply run install.sh script. It will create a docker image with JTA installed. When it's done you should create and start a docker container running the following commands from top directory: \begin{itemize} -\item \texttt{jta-host-scripts/docker-create-containter.sh}. -\item \texttt{jta-host-scripts/docker-start-containter.sh}. +\item \texttt{jta-host-scripts/docker-create-container.sh}. +\item \texttt{jta-host-scripts/docker-start-container.sh}. \end{itemize} When container is started, JTA web interface will be available on local machine at port \href{http://localhost:8080}{8080}. diff --git a/jta-host-scripts/docker-create-container.sh b/jta-host-scripts/docker-create-container.sh new file mode 100755 index 0000000..17c3e8c --- /dev/null +++ b/jta-host-scripts/docker-create-container.sh @@ -0,0 +1,10 @@ +#!/bin/bash +SOURCE="${BASH_SOURCE[0]}" +while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink + DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" + SOURCE="$(readlink "$SOURCE")" + [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located +done +DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" + +sudo docker create -it -v $DIR/../userdata:/userdata --net="host" jta diff --git a/jta-host-scripts/docker-create-containter.sh b/jta-host-scripts/docker-create-containter.sh deleted file mode 100755 index 17c3e8c..0000000 --- a/jta-host-scripts/docker-create-containter.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="${BASH_SOURCE[0]}" -while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink - DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" - SOURCE="$(readlink "$SOURCE")" - [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located -done -DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" - -sudo docker create -it -v $DIR/../userdata:/userdata --net="host" jta
The docker-create-containter.sh script has an extra 't' in the name. Fix this, and fix the README and install docs to match the name change. Signed-off-by: Tim Bird <tim.bird@sonymobile.com> --- README | 2 +- docs/source/install.tex | 4 ++-- jta-host-scripts/docker-create-container.sh | 10 ++++++++++ jta-host-scripts/docker-create-containter.sh | 10 ---------- 4 files changed, 13 insertions(+), 13 deletions(-) create mode 100755 jta-host-scripts/docker-create-container.sh delete mode 100755 jta-host-scripts/docker-create-containter.sh