diff --git a/.dockerignore b/.dockerignore new file mode 120000 index 0000000000000..3e4e48b0b5fe6 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +.gitignore \ No newline at end of file diff --git a/.gitignore b/.gitignore index a6e92ccb73d17..5558ae64dae9b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -*~ -*.pyc -/bashbrew/logs -/bashbrew/src +.git +bashbrew/logs +bashbrew/src diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000000000..cfd783422292d --- /dev/null +++ b/Dockerfile @@ -0,0 +1,12 @@ +FROM docker:git + +RUN apk add --update \ + bash \ + && rm -rf /var/cache/apk/* + +ENV DIR /usr/src/official-images +WORKDIR $DIR +COPY . $DIR +RUN ln -s "$(readlink -f bashbrew/bashbrew.sh)" /usr/local/bin/bashbrew + +VOLUME $DIR/bashbrew/logs $DIR/bashbrew/src diff --git a/bashbrew/bashbrew.sh b/bashbrew/bashbrew.sh index 702a690863079..28517589bc6b7 100755 --- a/bashbrew/bashbrew.sh +++ b/bashbrew/bashbrew.sh @@ -6,17 +6,13 @@ trap 'echo >&2 Ctrl+C captured, exiting; exit 1' SIGINT dir="$(dirname "$(readlink -f "$BASH_SOURCE")")" -library="$dir/../library" +library="$(dirname "$dir")/library" src="$dir/src" logs="$dir/logs" namespaces='_' docker='docker' retries='4' -library="$(readlink -f "$library")" -src="$(readlink -f "$src")" -logs="$(readlink -f "$logs")" - self="$(basename "$0")" usage() { @@ -107,6 +103,15 @@ while true; do esac done +if [ ! -d "$library" ]; then + echo >&2 "error: library directory '$library' does not exist" + exit 1 +fi +library="$(readlink -f "$library")" +mkdir -p "$src" "$logs" +src="$(readlink -f "$src")" +logs="$(readlink -f "$logs")" + # which subcommand subcommand="$1" shift || { usage >&2 && exit 1; }