From bd58936fc9f2e64fc466281092838d1e4d350f49 Mon Sep 17 00:00:00 2001
From: Noman Bashir <nbashir@mit.edu>
Date: Mon, 30 Dec 2024 13:23:38 -0500
Subject: [PATCH 1/2] Update README.md - remove my website link (#2926)

remove my website link
---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 605b1d4af052..f11f438a686e 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,6 @@ Feel free to add your own page(s) by sending a PR.
 <a href="https://daviddmc.github.io/" target="_blank">★</a>
 <a href="https://andreaskuster.ch/" target="_blank">★</a>
 <a href="https://ellisbrown.github.io/" target="_blank">★</a>
-<a href="https://noman-bashir.github.io/" target="_blank">★</a>
 <a href="https://djherron.github.io/" target="_blank">★</a>
 <a href="https://rodosingh.github.io/" target="_blank">★</a>
 <a href="https://vdivakar.github.io/" target="_blank">★</a>

From a3396b6c87b2bd05de6bfc70ffca4882233a4bf3 Mon Sep 17 00:00:00 2001
From: George <31376482+george-gca@users.noreply.github.com>
Date: Mon, 30 Dec 2024 22:12:54 -0300
Subject: [PATCH 2/2] Updated ffi, changed base docker image, added observer
 and ostruct (#2931)

Signed-off-by: George Araujo <george.gcac@gmail.com>
---
 Dockerfile         |  3 ++-
 Gemfile            |  2 ++
 Gemfile.lock       | 24 ++++++++++++++----------
 docker-compose.yml |  2 +-
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c131f26d4282..99109cdf9b16 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:latest
+FROM ruby:slim
 
 # uncomment these if you are having this issue with the build:
 # /usr/local/bundle/gems/jekyll-4.3.4/lib/jekyll/site.rb:509:in `initialize': Permission denied @ rb_sysopen - /srv/jekyll/.jekyll-cache/.gitignore (Errno::EACCES)
@@ -24,6 +24,7 @@ RUN apt-get update -y && \
     apt-get install -y --no-install-recommends \
         build-essential \
         curl \
+        git \
         imagemagick \
         inotify-tools \
         locales \
diff --git a/Gemfile b/Gemfile
index 09bfbf4d4980..b639d85be85d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,4 +26,6 @@ group :other_plugins do
     gem 'css_parser'
     gem 'feedjira'
     gem 'httparty'
+    gem 'observer' # used by jekyll-scholar
+    gem 'ostruct' # used by jekyll-twitter-plugin
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 84f49782b6c8..c46c54e35a28 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,16 +54,16 @@ GEM
     feedjira (3.2.3)
       loofah (>= 2.3.1, < 3)
       sax-machine (>= 1.0, < 2)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-aarch64-linux-musl)
-    ffi (1.17.0-arm-linux-gnu)
-    ffi (1.17.0-arm-linux-musl)
-    ffi (1.17.0-arm64-darwin)
-    ffi (1.17.0-x86-linux-gnu)
-    ffi (1.17.0-x86-linux-musl)
-    ffi (1.17.0-x86_64-darwin)
-    ffi (1.17.0-x86_64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-musl)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-musl)
+    ffi (1.17.1-arm-linux-gnu)
+    ffi (1.17.1-arm-linux-musl)
+    ffi (1.17.1-arm64-darwin)
+    ffi (1.17.1-x86-linux-gnu)
+    ffi (1.17.1-x86-linux-musl)
+    ffi (1.17.1-x86_64-darwin)
+    ffi (1.17.1-x86_64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-musl)
     forwardable-extended (2.6.0)
     gemoji (4.1.0)
     google-protobuf (4.29.2)
@@ -198,6 +198,8 @@ GEM
       racc (~> 1.4)
     nokogiri (1.18.1-x86_64-linux-musl)
       racc (~> 1.4)
+    observer (0.1.2)
+    ostruct (0.6.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (6.0.1)
@@ -284,6 +286,8 @@ DEPENDENCIES
   jekyll-toc
   jekyll-twitter-plugin
   jemoji
+  observer
+  ostruct
   terser
   unicode_utils
   webrick
diff --git a/docker-compose.yml b/docker-compose.yml
index 21a94884c7e2..d51e086f41aa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 # this file uses prebuilt image in dockerhub
 services:
   jekyll:
-    image: amirpourmand/al-folio:v0.13.2
+    image: amirpourmand/al-folio:v0.13.3
     build: .
     # uncomment these if you are having this issue with the build:
     # /usr/local/bundle/gems/jekyll-4.3.4/lib/jekyll/site.rb:509:in `initialize': Permission denied @ rb_sysopen - /srv/jekyll/.jekyll-cache/.gitignore (Errno::EACCES)