Zola port: redesign and cleanup

.github/workflows/deploy.yml

@@ -9,19 +9,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
-    - uses: ruby/setup-ruby@v1
-      with:
-        bundler-cache: true
-    - run: bundle install
-    - run: bundle exec middleman build
-
-    - id: variables
-      run: |
-        [[ ! -f .ruby-version ]] && exit 1
-        RUBY_VERSION="$(< .ruby-version)"
-        echo "::set-output name=RUBY_VERSION::${RUBY_VERSION}"
+    - name: Build with Zola
+      uses: shalzz/zola-deploy-action@v0.19.2
+      env:
+        BUILD_ONLY: true
 
     - uses: docker/setup-buildx-action@v2
     - uses: docker/login-action@v2
@@ -38,8 +31,6 @@ jobs:
         tags: |
           ghcr.io/flatpak/flatpak.github.io:${{ github.sha }}
           ghcr.io/flatpak/flatpak.github.io:latest
-        build-args: |
-          RUBY_VERSION=${{ steps.variables.outputs.RUBY_VERSION }}
         labels: |
           org.opencontainers.image.revision=${{ github.sha }}
           org.opencontainers.image.source=ssh://git@github.com:${{ github.repository }}.git

.gitignore

@@ -6,3 +6,4 @@
 .jekyll-cache
 .gem
 _site
+/public

Dockerfile

@@ -1,11 +1,9 @@
-ARG RUBY_VERSION
-FROM docker.io/library/ruby:$RUBY_VERSION AS build
+FROM ghcr.io/getzola/zola:v0.19.2 AS build
 
 WORKDIR /builddir
 COPY . .
-RUN bundle install --deployment
-RUN bundle exec middleman build
+RUN ["zola", "build"]
 
 FROM docker.io/nginxinc/nginx-unprivileged:stable
-COPY --from=build /builddir/build /srv/http/
+COPY --from=build /builddir/public /srv/http/
 ADD nginx.conf /etc/nginx/conf.d/default.conf

README.md

@@ -1,36 +1,79 @@
-# Flatpak.org website
+# flatpak.org website
 
-## Installation and setup
+The website for [Flatpak](https://flatpak.org).
 
-To set up middleman locally on Fedora:
+## Building
 
-```shell
-dnf install ruby rubygems rubygem-bundler rubygem-json
+This site is built with [Zola](https://www.getzola.org/), a fast static site generator.
+
+### Prerequisites
+
+Install Zola (v0.19+):
+
+```bash
+# Fedora
+sudo dnf install zola
+
+# macOS / Homebrew
+brew install zola
+
+# Or download from https://github.com/getzola/zola/releases
 ```
 
-In the git checkout, do a `bundle install`. This installs all
-the needed modules in their appropriate versions.
+### Development
 
-Add the middleman binary location (probably ~/bin) to $PATH.
+```bash
+zola serve
+```
 
-## Testing
+This starts a local server at `http://127.0.0.1:1111` with live reload.
 
-To run a local web server to test the site:
+### Production build
 
-```shell
-bundle exec middleman server
+```bash
+zola build
 ```
 
-Edit the haml/scss files and commit your changes, pushing to
-origin/source.
+Output is written to `public/`.
 
-## Devcontainer
+### Docker
 
-You can also use the devcontainer, for e.g. with VSCode. It should setup automatically and just expects you to run the testing command from above or command you would like to run.
+```bash
+docker build -t flatpak-website .
+docker run -p 8080:8080 flatpak-website
+```
+
+## Structure
+
+```
+config.toml          # Zola configuration
+content/             # Markdown content pages
+  _index.md          # Homepage
+  about.md           # About page
+  faq.md             # FAQ
+  presentations.md   # Presentations & articles
+  setup/             # Distro setup section
+    _index.md        # Setup hub page
+    ubuntu.md        # Per-distro setup pages
+    ...
+  press/             # Press releases (blog section with RSS)
+    _index.md        # Press index
+    2016-06-21-*.md  # Press release pages
+    ...
+templates/           # Zola Tera templates
+  base.html          # Base layout (nav, footer)
+  index.html         # Homepage template
+  page.html          # Generic content page
+  setup.html         # Setup hub
+  setup-distro.html  # Individual distro page
+  press.html         # Press index
+  press-page.html    # Individual press release
+  404.html           # 404 page
+static/              # Static assets (fonts, images, CSS)
+  style.css          # Main stylesheet (modern CSS, no preprocessor)
+data/                # Data files (apps.toml)
+```
 
-## Deployment
+## Contributing
 
-Pushing new commits automatically causes to trigger new build
-and deployment on OpenShift. It usually takes few minutes for
-changes to become visible. Files used for build can be found
-in `oscp` directory.
+Issues and pull requests are welcome on [GitHub](https://github.com/flatpak/flatpak.github.io).