simplify workflows and makefile

Author: willcl-ark

.github/actions/setup-build/action.yml

@@ -0,0 +1,22 @@
+name: 'Setup Build Environment'
+description: 'Set up Ruby, Node.js, and dependencies for Jekyll site building'
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Install Ruby and Jekyll
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.2.2'
+        bundler-cache: true
+        cache-version: 0
+    - name: Setup Node.JS 18
+      uses: actions/setup-node@v4
+      with:
+        node-version: 18
+    - name: Install mermaid-cli
+      shell: bash
+      run: npm install -g @mermaid-js/mermaid-cli
+    - name: Install bundle dependencies
+      shell: bash
+      run: bundle

.github/workflows/build.yml

@@ -17,22 +17,10 @@ jobs:
       - name: Configure Pages
         id: pages
         uses: actions/configure-pages@v5
-      - name: Install Ruby and Jekyll
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.2.2'
-          bundler-cache: true
-          cache-version: 0
-      - name: Setup Node.JS 18
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18
-      - name: Install mermaid-cli
-        run: npm install -g @mermaid-js/mermaid-cli
+      - name: Setup Build Environment
+        uses: ./.github/actions/setup-build
       - name: Generate Site
-        run: |
-          bundle
-          make all
+        run: make all
         env:
           JEKYLL_ENV: production
           ADD_JEKYLL_ARGS: --baseurl "${{ steps.pages.outputs.base_path }}"

.github/workflows/publish.yml

@@ -25,22 +25,10 @@ jobs:
       - name: Configure Pages
         id: pages
         uses: actions/configure-pages@v5
-      - name: Install Ruby and Jekyll
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.2.2'
-          bundler-cache: true
-          cache-version: 0
-      - name: Setup Node.JS 18
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18
-      - name: Install mermaid-cli
-        run: npm install -g @mermaid-js/mermaid-cli
+      - name: Setup Build Environment
+        uses: ./.github/actions/setup-build
       - name: Generate Site
-        run: |
-          bundle
-          make publish
+        run: make publish
         env:
           JEKYLL_ENV: production
           ADD_JEKYLL_ARGS: --baseurl "${{ steps.pages.outputs.base_path }}"

Dockerfile

@@ -15,8 +15,17 @@ ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium
 # Install correct bundler version
 RUN gem install bundler -v 2.7.1
 
+# Install mermaid-cli globally
+RUN npm install -g @mermaid-js/mermaid-cli
+
 WORKDIR /srv
 
+# Copy dependency files first for better caching
+COPY Gemfile Gemfile.lock package*.json ./
+
+# Install dependencies
+RUN bundle install && npm install
+
 EXPOSE 4000
 
-CMD ["bundle", "exec", "jekyll", "serve", "--host", "0.0.0.0", "--future", "--drafts", "--unpublished", "--incremental"]
+CMD ["sh", "-c", "bundle exec jekyll serve --host 0.0.0.0 --future --drafts --unpublished --incremental --force_polling"]

Makefile

@@ -24,13 +24,6 @@ docker-clean:
 	docker-compose down -v
 	docker system prune -f
 
-## Simple Docker commands
-docker-build:
-	docker buildx build -t guide .
-
-docker-run:
-	@echo "Use 'make docker-dev' instead for better volume handling"
-	@echo "Or run: docker-compose up dev"
 
 clean:
 	bundle exec jekyll clean

docker-compose.yml

@@ -12,8 +12,7 @@ services:
     environment:
       - BUNDLE_PATH=/usr/local/bundle
       - JEKYLL_ENV=development
-      - PATH=/srv/node_modules/.bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-    command: sh -c "bundle install && npm install && bundle exec jekyll serve --host 0.0.0.0 --future --drafts --unpublished --incremental --force_polling"
+      - PATH=/srv/node_modules/.bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin
 
   shell:
     build: .
@@ -23,7 +22,7 @@ services:
       - node_modules_cache:/srv/node_modules
     environment:
       - BUNDLE_PATH=/usr/local/bundle
-      - PATH=/srv/node_modules/.bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+      - PATH=/srv/node_modules/.bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin
     entrypoint: /bin/sh
     profiles:
       - tools