This is an automated email from the ASF dual-hosted git repository. gaul pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jclouds-site.git
commit 3285ef992b7c77933183963e23c782679f0eef31 Author: Fritz Elfert <[email protected]> AuthorDate: Sun Feb 9 23:29:04 2025 -0800 Unpin Ruby gems to allow make publish to succeed This reverts 5fa874000d841866e00c20362d3223f79ec0ffbb. --- Dockerfile | 26 +++++--------------------- Makefile | 2 +- _config.yml | 3 ++- deploy-site.sh | 4 ++-- 4 files changed, 10 insertions(+), 25 deletions(-) diff --git a/Dockerfile b/Dockerfile index e8d0cac..337dd58 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.2.5 +FROM ruby # Packages moved to archive.debian.org. Work around KEYEXPIRED error via: https://unix.stackexchange.com/a/755022/290212 RUN echo 'deb [trusted=yes] http://archive.debian.org/debian jessie main' > /etc/apt/sources.list @@ -8,26 +8,10 @@ RUN apt-get update && \ # ffi and rb-inotify are explicitly ordered RUN gem install \ - ffi:1.12.2 \ - rb-inotify:0.10.1 \ - blankslate:2.1.2.4 \ - classifier:1.3 \ - colorator:0.1 \ - commander:4.1.6 \ - highline:1.6.21 \ - liquid:3.0.6 \ - listen:1.3.1 \ - maruku:0.7.0 \ - mutex_m:0.1.0 \ - parslet:1.5.0 \ - posix-spawn:0.3.15 \ - pygments.rb:0.5.4 \ - rdiscount:2.2.7.3 \ - redcarpet:2.3.0 \ - safe_yaml:1.0.5 \ - toml:0.1.2 \ - yajl-ruby:1.1.0 -RUN gem install jekyll:1.5.1 --ignore-dependencies + ffi \ + jekyll \ + rdiscount \ + jekyll-paginate ENV LC_ALL=C.UTF-8 LANG=C.UTF-8 diff --git a/Makefile b/Makefile index 9b6f4ac..4f5b15b 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ image: ## Build the Docker image with all requirements to build and publish the docker build -t $(IMAGE) . build: ## Build and run the site locally - docker run --rm -v "$(CURDIR):$(MOUNTPOINT)" -p 4000:4000 $(IMAGE) jekyll serve --safe --port 4000 + docker run --rm -v "$(CURDIR):$(MOUNTPOINT)" -p 4000:4000 $(IMAGE) jekyll serve --safe --host 0.0.0.0 --port 4000 publish: ## Publish the site to https://jclouds.apache.org rm -rf site-content diff --git a/_config.yml b/_config.yml index dc38b83..ea0ff3b 100644 --- a/_config.yml +++ b/_config.yml @@ -1,7 +1,8 @@ url: https://jclouds.apache.org title: Apache jclouds -markdown: rdiscount +markdown: kramdown pygments: true +plugins: [jekyll-paginate] paginate: 5 paginate_path: "blog/page:num" permalink: /blog/:categories/:year/:month/:day/:title diff --git a/deploy-site.sh b/deploy-site.sh index d2bb337..3d87deb 100755 --- a/deploy-site.sh +++ b/deploy-site.sh @@ -5,12 +5,12 @@ # Build the site using the default Jekyll version: # $ ./deploy-site.sh [username] [password] -JEKYLL_VERSION=1.5.1 +JEKYLL_VERSION=4.4.1 # Verify that the configured version of Jekyll is installed jekyll _${JEKYLL_VERSION}_ --version >/dev/null 2>&1 if [[ $? -ne 0 ]]; then - echo "Jekyll ${JEKYLL_VERSION} is required" + echo "Jekyll ${JEKYLL_VERSION} is required, found $(jekyll --version)" exit 1 fi
