#20 Update to latest build template and fix nav build
Merged 5 years ago by pbokoc. Opened 5 years ago by bex.
Unknown source fix-local-build  into  master

file modified
+2
@@ -1,3 +1,5 @@

  ---

  name: fedora

  version: rawhide

+ nav:

+ - modules/install-guide/nav.adoc

file modified
+18 -4
@@ -1,16 +1,30 @@

  #!/bin/sh

  

+ image="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

+     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

      # 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 groups | grep -wq "docker"; then

+         # Check if the current user is in the "docker" group. If true, no sudo is needed.

+         echo ""

+         echo "This build script is using Docker to run the build in an isolated environment."

+         echo ""

+         docker run --rm -it -v $(pwd):/antora:z $image $cmd

+     else

+         # User isn't in the docker group; run the command with sudo.

+         echo ""

+         echo "This build script is using Docker 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

  fi

file added
+14
@@ -0,0 +1,14 @@

+ server {

+     listen       80;

+     server_name  localhost;

+ 

+     location / {

+         root   /antora/public;

+         index  index.html index.htm;

+     }

+ 

+     error_page   500 502 503 504  /50x.html;

+     location = /50x.html {

+         root   /usr/share/nginx/html;

+     }

+ }

file modified
+18 -5
@@ -5,14 +5,27 @@

      # Let's assume that the user has the Docker CE installed

      # which doesn't require a root password.

      echo "The preview will be available at http://localhost:8080/"

-     docker run --rm -v $(pwd)/public:/usr/share/nginx/html:ro -p 8080:80 nginx

+     docker run --rm -v $(pwd):/antora:ro -v $(pwd)/nginx.conf:/etc/nginx/conf.d/default.conf:ro -p 8080:80 nginx

  

  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.

-     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)/public:/usr/share/nginx/html:ro -p 8080:80 nginx

+     if groups | grep -wq "docker"; then

+         # Check if the current user is in the "docker" group. If true, no sudo is needed.

+         echo ""

+         echo "This build script is using Docker to run the build in an isolated environment."

+         echo "The preview will be available at http://localhost:8080/"

+         echo ""

+         docker run --rm -v $(pwd):/antora:ro,z -v $(pwd)/nginx.conf:/etc/nginx/conf.d/default.conf:ro,z -p 8080:80 nginx

+     else

+         # User isn't in the docker group; run the command with sudo.

+         echo ""

+         echo "This build script is using Docker 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 ""

+         echo "The preview will be available at http://localhost:8080/"

+         echo ""

+         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

+     fi

  fi

file modified
-2
@@ -3,8 +3,6 @@

    start_page: fedora:install-guide:index

  content:

    sources:

-    - url: https://pagure.io/forks/bex/fedora-docs/docs-fp-o.git

-      branches: antora_rawhide

     - url: .

       branches: HEAD

  ui:

no initial comment

Pull-Request has been merged by pbokoc

5 years ago