Upgrade jekyll docker and fix dependabot alerts

RoboSats · Oct 19, 2024 · 69eeb46 · 69eeb46
1 parent 86b3071
commit 69eeb46
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 303 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,14 +1,9 @@
 version: '3.9'
 services:
   jekyll:
-    image: jekyll/jekyll:4.0
     container_name: pages
+    build: ./docs
     restart: always
-    volumes:
-      - .:/usr/src/robosats
-    command: bash -c "cd /usr/src/robosats/docs/
-            && bundle install
-            && bundle exec jekyll serve --force_polling -H 0.0.0.0 -P 4000"
     ports:
       - 4000:4000
 

diff --git a/docs/Dockerfile b/docs/Dockerfile
@@ -0,0 +1,12 @@
+FROM jekyll/jekyll:4.0
+
+WORKDIR /usr/src/docs
+
+COPY . .
+
+RUN chown -R jekyll:jekyll /usr/src/docs
+RUN chmod -R 755 /usr/src/docs
+
+RUN bundle install
+
+CMD ["bundle", "exec", "jekyll", "serve", "--force_polling", "-H", "0.0.0.0", "-P", "4000"]
diff --git a/docs/Gemfile b/docs/Gemfile
@@ -7,6 +7,8 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
+
+gem "activesupport", ">= 6.1.7.5"
 gem "minimal-mistakes-jekyll"
 gem "jekyll-include-cache"
 gem "webrick"

diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
diff --git a/docs/docker-compose.yml b/docs/docker-compose.yml
@@ -1,13 +1,8 @@
 version: '3.9'
 services:
   jekyll:
-    image: jekyll/jekyll:4.0
     container_name: pages
+    build: .
     restart: always
-    volumes:
-      - .:/usr/src/docs
-    command: bash -c "cd /usr/src/docs/
-            && bundle install
-            && bundle exec jekyll serve --force_polling -H 0.0.0.0 -P 4000"
     ports:
       - 4000:4000