|
|
@@ -1,5 +1,5 @@
|
|
|
#!/bin/bash
|
|
|
-# (c) 2014-2015 Freifunk Paderborn <maschinenraum@paderborn.freifunk.net>
|
|
|
+# (c) 2014-2015 Freifunk Hochstift <maschinenraum@hochstift.freifunk.net>
|
|
|
|
|
|
# check if we're in the container
|
|
|
running_in_docker() {
|
|
|
@@ -11,7 +11,7 @@ if [ running_in_docker -a "$(id -un)" == "build" ]; then
|
|
|
|
|
|
# ensure that we have a valid git config
|
|
|
git config --global user.name "docker-based build"
|
|
|
- git config --global user.email build@paderborn.freifunk.net
|
|
|
+ git config --global user.email build@hochstift.freifunk.net
|
|
|
|
|
|
# invoke the actual build
|
|
|
./build.sh $@
|
|
|
@@ -23,7 +23,7 @@ MYDIR="$(readlink -f $MYDIR)"
|
|
|
pushd "$MYDIR" > /dev/null
|
|
|
|
|
|
# run the container with fixed hostname and mapped /code directory
|
|
|
-docker run -ti -h ffpb-build -v "$MYDIR:/code" \
|
|
|
+docker run -ti -h ffho-build -v "$MYDIR:/code" \
|
|
|
--env BUILD_TS="$BUILD_TS" \
|
|
|
--env BASE="$BASE" \
|
|
|
--env BRANCH="$BRANCH" \
|
|
|
@@ -36,5 +36,4 @@ docker run -ti -h ffpb-build -v "$MYDIR:/code" \
|
|
|
--env SITE_ID="$SITE_ID" \
|
|
|
ffpb/build
|
|
|
|
|
|
-popd > /dev/null
|
|
|
-
|
|
|
+popd > /dev/null
|
