Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c7bf5e448c |
No files matched your search
+1
-6
@@ -8,8 +8,6 @@ set -eu
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
|
||||
ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
|
||||
|
||||
set -x
|
||||
|
||||
main() {
|
||||
cd "$ROOT"
|
||||
# Own line: a failing command substitution inside an argument does
|
||||
@@ -25,10 +23,7 @@ main() {
|
||||
--build-arg VERSION="$version" \
|
||||
--build-arg REVISION="$revision" \
|
||||
--build-arg CREATED="$created" \
|
||||
-t "$("$SCRIPT_DIR/projectname")" \
|
||||
-t "$("$SCRIPT_DIR/projectname"):$version" \
|
||||
-t "$("$SCRIPT_DIR/projectname"):$(date -u +%Y-%m-%d)" \
|
||||
.
|
||||
-t "$("$SCRIPT_DIR/projectname")" .
|
||||
}
|
||||
|
||||
main "$@"
|
||||
+6
-9
@@ -14,16 +14,13 @@ set -eu
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
|
||||
ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
|
||||
|
||||
main() {
|
||||
if [ -z "${DOCKER_HOST:-}" ]; then
|
||||
echo "script/publish: DOCKER_HOST is not set; set it to the Docker host that builds the image, such as ssh://user@build.example.com" >&2
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${PUBLISH_IMAGE:-}" ]; then
|
||||
echo "script/publish: PUBLISH_IMAGE is not set; set it to the image name in the registry, such as registry.example.com/smallwebwaf" >&2
|
||||
exit 1
|
||||
fi
|
||||
PUBLISH_IMAGE="git.eeqj.de/sneak/smallwebwaf"
|
||||
|
||||
main() {
|
||||
|
||||
# we don't set DOCKER_HOST here because the caller is expected to have
|
||||
# either already set it, or used 'docker context' to make 'docker
|
||||
# <whatever>' "just work".
|
||||
cd "$ROOT"
|
||||
|
||||
# Own line: a failing command substitution inside an argument does
|
||||
|
||||
Reference in new issue
Block a user