Revert "Update dependencies"

This reverts commit 01b17bfa5bd6625315a387cd000fb880dd408015. This breaks www.git deployment, need to figure out why (Robin mentions jekyll gives 'error 42', I can't get the container to serve locally right now even before the commit). Bug: https://bugs.gentoo.org/942809 Signed-off-by: Sam James <sam@gentoo.org>
author: Sam James <sam@gentoo.org> 2024-11-23 09:23:58 +0000
committer: Sam James <sam@gentoo.org> 2024-11-23 09:23:58 +0000
commit: 9c0e978f2a789fb54fad904bde92c35f9511ba4d (patch)
tree: b06a6311aa460ea4c84c51d84e8a7a0891d69c15
parent: Update dependencies (diff)
download: www-9c0e978.tar.gz
www-9c0e978.tar.bz2
www-9c0e978.zip
7 files changed, 85 insertions, 74 deletions
diff --git a/.bundle/config b/.bundle/config
index 5fac834..e6298f9 100644
--- a/.bundle/config
+++ b/.bundle/config
@@ -2,4 +2,3 @@
 BUNDLE_JOBS: "8"
 BUNDLE_PATH: "vendor/bundle"
 BUNDLE_CACHE: "vendor/cache"
-BUNDLE_FORCE_RUBY_PLATFORM: true
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..15d0ebf
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+# Exclude everything except specified files.
+*
+!Gemfile
+!Gemfile.lock
diff --git a/Dockerfile b/Dockerfile
index 4aed08e..a9a89f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,19 +1,20 @@
-FROM alpine:3.20
+ARG JEKYLL_VERSION=4.1.0
+FROM jekyll/jekyll:${JEKYLL_VERSION}
 # py3-pygments: Needed for rbst Gem, because it calls Python directly
 # py3-docutils: Needed for GLEPs
 # GnuPG: Needed for WKD
 RUN apk add --no-cache \
-	ruby-bundler \
-	ruby-dev \
-	libffi-dev \
-	zlib-dev \
-	build-base \
 	gnupg \
-	git \
 	python3 \
 	py3-docutils \
 	py3-pygments \
 	&& ln -sf python3 /usr/bin/python
 
-ENV HOME=/tmp
-WORKDIR /srv/jekyll
+# Ruby stuff
+COPY Gemfile /srv/jekyll/
+COPY Gemfile.lock /srv/jekyll/
+ARG BUNDLE_JOBS=2
+RUN cd /srv/jekyll/ \
+	&& bundle install \
+	&& rm -vrf \
+		/home/jekyll/.bundle/cache
diff --git a/Gemfile b/Gemfile
index 729e009..2861ba6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gem "RbST" # used for GLEPs, needs local python
 gem "base32"
 gem "nokogiri"
 gem "kramdown-parser-gfm"
-gem "rexml"
+gem "rexml", '3.2.3' # has to match container
 
 group :jekyll_plugins do
    gem "jekyll-feed", "~> 0.6"
diff --git a/Gemfile.lock b/Gemfile.lock
index f1edada..a79f0a2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,97 +2,99 @@ GEM
   remote: https://rubygems.org/
   specs:
     RbST (0.6.5)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
     base32 (0.3.4)
-    bigdecimal (3.1.8)
     colorator (1.1.0)
-    concurrent-ruby (1.3.4)
-    em-websocket (0.5.3)
+    concurrent-ruby (1.1.9)
+    em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0)
+      http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    faraday (2.12.0)
-      faraday-net_http (>= 2.0, < 3.4)
-      json
-      logger
-    faraday-net_http (3.3.0)
-      net-http
-    ffi (1.17.0)
+    faraday (1.7.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    ffi (1.15.3)
     forwardable-extended (2.6.0)
-    google-protobuf (4.28.3)
-      bigdecimal
-      rake (>= 13)
-    http_parser.rb (0.8.0)
-    i18n (1.14.6)
+    http_parser.rb (0.6.0)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    jekyll (4.3.4)
+    jekyll (4.2.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
-      jekyll-sass-converter (>= 2.0, < 4.0)
+      jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.3, >= 2.3.1)
+      kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (>= 0.3.6, < 0.5)
+      mercenary (~> 0.4.0)
       pathutil (~> 0.9)
-      rouge (>= 3.0, < 5.0)
+      rouge (~> 3.0)
       safe_yaml (~> 1.0)
-      terminal-table (>= 1.8, < 4.0)
-      webrick (~> 1.7)
-    jekyll-feed (0.17.0)
+      terminal-table (~> 2.0)
+    jekyll-feed (0.15.1)
       jekyll (>= 3.7, < 5.0)
     jekyll-gist (1.5.0)
       octokit (~> 4.2)
     jekyll-paginate (1.1.0)
-    jekyll-sass-converter (3.0.0)
-      sass-embedded (~> 1.54)
+    jekyll-sass-converter (2.1.0)
+      sassc (> 2.0.1, < 3.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json (2.7.5)
-    kramdown (2.4.0)
+    kramdown (2.3.1)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.4)
-    listen (3.9.0)
+    liquid (4.0.3)
+    listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.1)
     mercenary (0.4.0)
-    mini_portile2 (2.8.7)
-    net-http (0.4.1)
-      uri
-    nokogiri (1.16.7)
-      mini_portile2 (~> 2.8.2)
+    mini_portile2 (2.6.1)
+    multipart-post (2.1.1)
+    nokogiri (1.12.3)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    octokit (4.25.1)
-      faraday (>= 1, < 3)
-      sawyer (~> 0.9)
+    octokit (4.21.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (6.0.1)
-    racc (1.8.1)
-    rake (13.2.1)
-    rb-fsevent (0.11.2)
-    rb-inotify (0.11.1)
+    public_suffix (4.0.6)
+    racc (1.5.2)
+    rb-fsevent (0.11.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.3.9)
-    rouge (4.4.0)
+    rexml (3.2.3)
+    rouge (3.26.0)
+    ruby2_keywords (0.0.5)
     safe_yaml (1.0.5)
-    sass-embedded (1.80.6)
-      google-protobuf (~> 4.28)
-      rake (>= 13)
-    sawyer (0.9.2)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sawyer (0.8.2)
       addressable (>= 2.3.5)
-      faraday (>= 0.17.3, < 3)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
-    unicode-display_width (2.6.0)
-    uri (0.13.1)
-    webrick (1.9.0)
+      faraday (> 0.8, < 2.0)
+    terminal-table (2.0.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
@@ -105,7 +107,7 @@ DEPENDENCIES
   jekyll-paginate (~> 1.1)
   kramdown-parser-gfm
   nokogiri
-  rexml
+  rexml (= 3.2.3)
 
 BUNDLED WITH
-   2.5.9
+   2.2.25
diff --git a/README.md b/README.md
index 702fd7a..9818065 100644
--- a/README.md
+++ b/README.md
@@ -21,8 +21,8 @@ From the root of the repository (requires app-containers/docker, app-containers/
 
 ```
 bash ./bin/update.sh
-bash bin/docker-setup.sh bundle install
-bash bin/docker-setup.sh bundle exec jekyll serve
+bash bin/docker-setup.sh jekyll build 
+bash bin/docker-setup.sh jekyll serve
 ```
 
 #### Building and running manually 
diff --git a/bin/docker-helper.inc b/bin/docker-helper.inc
index 5ef8830..2d0e08e 100644
--- a/bin/docker-helper.inc
+++ b/bin/docker-helper.inc
@@ -12,6 +12,7 @@ docker_build() {
 	# Always refresh the image
 	# Docker caches it anyway
 	docker build \
+		--network=host \
 		--quiet \
 		-t "${IMAGE}" \
 		"${DOCKER_BUILD_OPTIONS[@]}" \
@@ -23,7 +24,11 @@ _docker_run_common() {
 	_GID=$(id -g)
 	docker run \
 		--rm \
-		--user "${_UID}:${_GID}" \
+		-e JEKYLL_UID="${_UID}" \
+		-e JEKYLL_GID="${_GID}" \
+		-e JEKYLL_ROOTLESS= \
+		-e CONNECTED=false \
+		-e DEBUG=false \
 		--volume="${PWD}:/srv/jekyll" \
 		"${DOCKER_RUN_OPTIONS[@]}" \
 		"$@"
author	Sam James <sam@gentoo.org>	2024-11-23 09:23:58 +0000
committer	Sam James <sam@gentoo.org>	2024-11-23 09:23:58 +0000
commit	9c0e978f2a789fb54fad904bde92c35f9511ba4d (patch)
tree	b06a6311aa460ea4c84c51d84e8a7a0891d69c15
parent	Update dependencies (diff)
download	www-9c0e978.tar.gz www-9c0e978.tar.bz2 www-9c0e978.zip