Merge branch 'master' into pcolmer-patch-1

Dockerfile

@@ -37,6 +37,9 @@ ENV UNVERSIONED_DEPENDENCY_PACKAGES \
  # Needed by the build-site script to determine if this is the latest container.
  curl \
  jq \
+ # Needed by the build-site script to copy stuff and retrieve repos.
+ rsync \
+ git \
  # Jekyll prerequisites, except Ruby. https://jekyllrb.com/docs/installation/
  build-essential \
  # Required for callback plugin.
@@ -114,34 +117,35 @@ ENV RUBY_GEMS \
  jekyll-include-cache:0.2.0 \
  # Used by devicetree.org
  jekyll-minimagick:0.0.4 \
- # Used by ?
+ # Used by 96boards.org
  jekyll-relative-links:0.6.0 \
  # Used by connect.linaro.org, linaro.cloud
  jekyll-responsive-image:1.5.2 \
- # Used by ?
- jekyll-titles-from-headings:0.5.1 \
+ # Used by 96boards.org
+ jekyll-toc:0.12.1 \
  # Used by lkft.linaro.org
  jumbo-jekyll-theme:1.4.4 \
  # Used by 96boards.ai
  jumbo-jekyll-theme:3.9.4 \
  # Used by staging.96boards.ai
  jumbo-jekyll-theme:5.3.4 \
- # Used by staging.connect.linaro.org
- jumbo-jekyll-theme:5.6.3 \
+ # Used by (staging.)connect.linaro.org
  jumbo-jekyll-theme:5.6.4 \
  # Used by 96boards.org
  jumbo-jekyll-theme:5.5.3 \
- # Used by connect.linaro.org, devicetree.org, linaro.cloud, linaro.org,
+ # Used by devicetree.org, linaro.cloud, linaro.org,
  # mlplatform.org, op-tee.org, trustedfirmware.org,
  jumbo-jekyll-theme:5.5.1 \
  # Used by staging.linaro.org
- jumbo-jekyll-theme:5.5.5 \
+ jumbo-jekyll-theme:5.6.5 \
  # Used by devicetree.org, op-tee.org
  mini_magick:4.9.3 \
  # Used by connect.linaro.org, linaro.cloud, linaro.org
- nokogiri:1.10.3 \
+ nokogiri:1.10.4 \
  # Used by staging.lkft.linaro.org
- seriously_simple_static_starter:0.7.0
+ seriously_simple_static_starter:0.7.0 \
+ # Staged for removal (ensures builds pass)
+ jumbo-jekyll-theme:5.5.5
 LABEL org.linaro.gems=${RUBY_GEMS}
 
 RUN gem install --no-document \

README.md

@@ -1,19 +1,22 @@
 # jekyll-build-container
+
 A Docker container used by Linaro's web site build process.
 
 The container isolates the building of Linaro's Jekyll-based web sites. This avoids needing to install directly on the host the numerous packages used when building the sites. The container includes all of the Ruby gems used across the web sites, which is why it is critical that changes made to Gemfiles in any of the website repositories must be matched with a corresponding change to the gems referenced in the Dockerfile. Failure to do so could result in build failure on Linaro's Bamboo build service.
 
 In addition to the notes below, more documentation can be found on the [wiki](https://github.com/linaro-its/jekyll-build-container/wiki).
 
 ## Building
+
 ### Prerequisites
 
 * An operating system capable of running [Docker](https://www.docker.com)
 * Enough free RAM and disc space
 
-Building has been tested with [Docker Community Edition](https://www.docker.com/community-edition#/download) under [Arch Linux](https://archlinux.org) and [Ubuntu](https://www.ubuntu.com).
+Building has been tested with [Docker Community Edition](https://www.docker.com/community-edition#/download) under [Arch Linux](https://archlinux.org), [Ubuntu](https://www.ubuntu.com) and [Windows 10](https://www.microsoft.com).
+
+### Building the container
 
-### Building
 Build the container in the usual way, e.g.
 
 `docker build --rm -t "linaroits/jekyllsitebuild:<tag>" .`
@@ -22,7 +25,7 @@ Build the container in the usual way, e.g.
 
 `JEKYLLSITEBUILD="personaltag" ./build-site.sh`
 
-If you omit `<tag>`, Docker will default to tagging the container as `latest` which could cause confusion if testing local changes. For that reason, Linaro-provided versions of the jekyllsitebuild container will display the Bamboo build reference at the start of the scripts being run, e.g.:
+If you omit `<tag>`, Docker will default to tagging the container as `latest` which could cause confusion if testing local changes. For that reason, Linaro-provided versions of the `jekyllsitebuild` container will display the Bamboo build reference at the start of the scripts being run, e.g.:
 
 ```
 Container built by bamboo.linaro.org: CON-JBC-JOB1-43