Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions ship
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ENTRYPOINT="main"
GIT=$(command -v git)
DOCKER=$(command -v docker)

if [ -n "$DEBUG" ]
if [ -n "$DEBUG" ]
then
set -x
fi
Expand Down Expand Up @@ -53,7 +53,7 @@ display_help()
into RUN instructions.

Arguments:
image The name of Dockerimage to be executed.
image The name of Dockerimage to be executed.
The image must have bash installed.
Options:
-o | --out <filename> The name of the Dockerfile to be creared.
Expand Down Expand Up @@ -115,13 +115,13 @@ main()
{
if [ -z "${OPTION_IMAGE}" ]
then
echo "No image specified! Run 'ship --help' for more information."
echo "No image specified! Run 'ship --help' for more information."
return 1
fi

user=$(inspect_image 'whoami')
if [ "$user" = "root" ]
then
then
home="/root"
else
home="/home/${user}"
Expand All @@ -148,8 +148,8 @@ main()
--name "ship-generating-dockerfile" \
-it \
-e "HISTSIZE=10000" \
-e 'HISTCONTROL="erasedups:ignoreboth"' \
-e 'HISTIGNORE="&:[ ]*:exit:ls:bg:fg:history:clear"' \
-e 'HISTCONTROL=erasedups:ignoreboth' \
-e 'HISTIGNORE=&:[ ]*:exit:ls:bg:fg:history:clear' \
-v "${container_home}:${home}" \
-v "${PWD}:/home/developer" \
"${OPTION_IMAGE}" \
Expand Down Expand Up @@ -187,7 +187,7 @@ main()
while :;
do
if [ $# -eq 0 ]
then
then
break
fi

Expand Down