Released & Edited Lab

.github/workflows/build-and-deploy.yml

@@ -24,11 +24,10 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
 
-    - name: Setup Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        bundler-cache: true
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
 
+<<<<<<< HEAD
     - name: Build with Jekyll
       env:
         JEKYLL_ENV: production
@@ -38,6 +37,18 @@ jobs:
         baseurl: ""
       # Outputs to './_site' dir by default
       run: bundle exec jekyll build
+=======
+    - name: Cache Docker layers
+      uses: actions/cache@v3
+      with:
+        path: /tmp/.buildx-cache
+        key: ${{ runner.os }}-buildx-${{ github.sha }}
+        restore-keys: |
+          ${{ runner.os }}-buildx-
+
+    - name: Build with Docker
+      run: docker compose up --build
+>>>>>>> 6768bd5df5835e6a1af20fc0828963ef3c98273c
 
     - name: Setup SSH keys
       run: |

Dockerfile

@@ -0,0 +1,13 @@
+FROM ruby:3.2
+
+WORKDIR /usr/src/jekyll
+
+COPY Gemfile Gemfile.lock ./
+
+RUN bundle config set path '/usr/local/bundle' \
+    && bundle config set deployment true \
+    && bundle install
+
+
+CMD ["bundle", "exec", "jekyll", "build"]
+

Gemfile

@@ -1,6 +1,9 @@
 source 'https://rubygems.org'
+
 gem 'github-pages', group: :jekyll_plugins
+gem "liquid", "= 4.0.4"
 
-gem "webrick", "~> 1.7"
+group :development do
+  gem "webrick", "~> 1.7"
+end
 
-gem "liquid", "= 4.0.4"

_config.yml

@@ -20,7 +20,7 @@ author: Nikhil Jha, Ben Cuan
 baseurl: "" # the subpath of your site, e.g. /blog
 url: 'https://decal.ocf.berkeley.edu' # the base hostname & protocol for your site, e.g. http://example.com
 repository: "ocf/decal-web"
-exclude: ["Gemfile", "Gemfile.lock", "LICENSE", "README.md", vendor, Makefile]
+exclude: ["Gemfile", "Gemfile.lock", "LICENSE", "README.md", vendor, "Makefile", "Dockerfile", "docker-compose.yml"]
 
 # Theme settings
 remote_theme: pmarsceill/just-the-docs@v0.3.3

docker-compose.yml

@@ -0,0 +1,6 @@
+services:
+  jekyll:
+    build: .
+    user: "${UID}:${GID}"
+    volumes:
+      - .:/usr/src/jekyll