This is an automated email from the git hooks/post-receive script.
pbokoc pushed a commit to branch master
in repository defensive-coding-guide.
commit a545203c03572ad1210575fd55c8e04c79dad023
Author: Petr Bokoc <pbokoc(a)redhat.com>
AuthorDate: Tue Mar 17 23:16:07 2020 +0100
Update build & preview scripts
---
build.sh | 40 +++++++++++++++++++++++++++++++++++-----
preview.sh | 10 +++++-----
2 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/build.sh b/build.sh
index c9349e3..1e4db2d 100755
--- a/build.sh
+++ b/build.sh
@@ -1,16 +1,46 @@
#!/bin/sh
+image="docker.io/antora/antora"
+cmd="--html-url-extension-style=indexify site.yml"
+
if [ "$(uname)" == "Darwin" ]; then
# Running on macOS.
# Let's assume that the user has the Docker CE installed
# which doesn't require a root password.
- docker run --rm -it -v $(pwd):/antora antora/antora
--html-url-extension-style=indexify site.yml
+ echo ""
+ echo "This build script is using Docker container runtime to run the build in an
isolated environment."
+ echo ""
+ docker run --rm -it -v $(pwd):/antora $image $cmd
elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
# Running on Linux.
- # Let's assume that it's running the Docker deamon
+ # Check whether podman is available, else faill back to docker
# which requires root.
- echo ""
- echo "This build script is using Docker to run the build in an isolated
environment. You might be asked for a root password in order to start it."
-sudo docker run --rm -it -v $(pwd):/antora:z antora/antora
--html-url-extension-style=indexify site.yml
+
+ if [ -f /usr/bin/podman ]; then
+ echo ""
+ echo "This build script is using Podman to run the build in an isolated
environment."
+ echo ""
+ podman run --rm -it -v $(pwd):/antora:z $image $cmd
+
+ elif [ -f /usr/bin/docker ]; then
+ echo ""
+ echo "This build script is using Docker to run the build in an isolated
environment."
+ echo ""
+
+ if groups | grep -wq "docker"; then
+ docker run --rm -it -v $(pwd):/antora:z $image $cmd
+ else
+ echo ""
+ echo "This build script is using $runtime to run the build in an
isolated environment. You might be asked for your password."
+ echo "You can avoid this by adding your user to the 'docker'
group, but be aware of the security implications. See
https://docs.docker.com/install/linux/linux-postinstall/."
+ echo ""
+ sudo docker run --rm -it -v $(pwd):/antora:z $image $cmd
+ fi
+ else
+ echo ""
+ echo "Error: Container runtime haven't been found on your system. Fix it
by:"
+ echo "$ sudo dnf install podman"
+ exit 1
+ fi
fi
diff --git a/preview.sh b/preview.sh
index c2fcc4b..acc52af 100755
--- a/preview.sh
+++ b/preview.sh
@@ -9,10 +9,10 @@ if [ "$(uname)" == "Darwin" ]; then
elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
# Running on Linux.
- # Let's assume that it's running the Docker deamon
- # which requires root.
+ # Fedora Workstation has python3 installed as a default, so using that
echo ""
- echo "This build script is using Docker to run the build in an isolated
environment. You might be asked for a root password in order to start it."
- echo "The preview will be available at
http://localhost:8080/"
- sudo docker run --rm -v $(pwd):/antora:ro,z -v
$(pwd)/nginx.conf:/etc/nginx/conf.d/default.conf:ro,z -p 8080:80 nginx
+ echo "The preview is available at
http://localhost:8080"
+ echo ""
+ cd ./public
+ python3 -m http.server 8080
fi
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.