Merge branch 'pr/1901'

* pr/1901: (182 commits) Update README.md Add my website (alshedivat#1859) fix inconsistent alignment for latest posts (alshedivat#1832) Added shubhashisroydipta.com to README.md (alshedivat#1816) Update README.md (alshedivat#1856) Update README.md (alshedivat#1837) Added my website in the list (alshedivat#1834) fix reference disappearing for distill blog in absence of author (alshedivat#1804) Update Dockerfile Add DockerSlim (alshedivat#1699) Add Reload to Docker (Automatic Reload of Changes to _config.yaml) (alshedivat#1702) Fix a small bug in giscus template Make publication thumbnails optional + fix small layout bugs (alshedivat#1797) Remove by year grouping from selected publications (alshedivat#1796) Update giscus setup via github action (alshedivat#1792) Update README.md (alshedivat#1789) Fix Docker Problem (alshedivat#1785) Optimize Dockerfile (alshedivat#1700) Update README.md Update README.md ...
semicolonsnet · Nov 13, 2023 · 3c1e8c4 · 3c1e8c4
2 parents b928011 + 3af895c
commit 3c1e8c4
Show file tree

Hide file tree

Showing 141 changed files with 19,348 additions and 438 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -40,6 +40,16 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "george-gca",
+      "name": "George",
+      "avatar_url": "https://github.com/avatars/u/31376482?v=4",
+      "profile": "https://george-gca.github.io/",
+      "contributions": [
+        "code"
+      ]
     }
-  ]
+  ],
+  "commitConvention": "angular"
 }
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,3 @@
+_site/
+.git/
+assets/
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
diff --git a/.github/release.yml b/.github/release.yml
@@ -0,0 +1,14 @@
+changelog:
+  exclude:
+    labels:
+      - ignore-for-release
+  categories:
+    - title: new features 🚀
+      labels:
+        - enhancement
+    - title: bug fixes and improvements ✨
+      labels:
+        - bug-fix
+    - title: other changes 🛠️
+      labels:
+        - "*"
diff --git a/.github/workflows/deploy-docker-tag.yml b/.github/workflows/deploy-docker-tag.yml
@@ -13,10 +13,14 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2 
+
     - name: Buildx
-      uses: docker/setup-buildx-action@v1
-
+      uses: docker/setup-buildx-action@v2
+      
     -
       name: Docker meta
       id: meta
@@ -25,7 +29,7 @@ jobs:
         images: amirpourmand/al-folio
 
     - name: Login
-      uses: docker/login-action@v1
+      uses: docker/login-action@v2
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
@@ -34,6 +38,7 @@ jobs:
       uses: docker/build-push-action@v3
       with:
         context: .
+        platforms: linux/amd64,linux/arm64/v8
         push: ${{ github.event_name != 'pull_request' }}
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}

diff --git a/.github/workflows/deploy-image.yml b/.github/workflows/deploy-image.yml
@@ -13,19 +13,24 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
     - name: Buildx
-      uses: docker/setup-buildx-action@v1
+      uses: docker/setup-buildx-action@v2
 
     - name: Login
-      uses: docker/login-action@v1
+      uses: docker/login-action@v2
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
     - name: Build and push
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v4
       with:
         context: .
         push: true
+        platforms: linux/amd64,linux/arm64/v8
         tags: amirpourmand/al-folio
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -9,34 +9,41 @@ on:
     branches:
       - master
       - main
+  workflow_dispatch:
+
+permissions:
+  contents: write
 
 jobs:
   deploy:
+    # available images: https://github.com/actions/runner-images#available-images
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout code
+    - name: Checkout 🛎️
       uses: actions/checkout@v3
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.0.2'
+        ruby-version: '3.2.2'
         bundler-cache: true
-    - name: Install deps
+    - name: Update _config.yml ⚙️
+      uses: fjogeleit/yaml-update-action@v0.13.1
+      with:
+        commitChange: false
+        valueFile: '_config.yml'
+        propertyPath: 'giscus.repo'
+        value: ${{ github.repository }}
+    - name: Install and Build 🔧
       run: |
+        pip3 install --upgrade jupyter
         npm install -g mermaid.cli
-    - name: Setup deploy options
-      id: setup
-      run: |
-        git config --global user.name "GitHub Action"
-        git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-        if [[ ${GITHUB_REF} = refs/pull/*/merge ]]; then # pull request
-          echo "::set-output name=SRC_BRANCH::${GITHUB_HEAD_REF}"
-          echo "::set-output name=NO_PUSH::--no-push"
-        elif [[ ${GITHUB_REF} = refs/heads/* ]]; then # branch, e.g. master, source etc
-          echo "::set-output name=SRC_BRANCH::${GITHUB_REF#refs/heads/}"
-        fi
-        echo "::set-output name=DEPLOY_BRANCH::gh-pages"
-    - name: Deploy website 
-      run:  yes | bash bin/deploy --verbose ${{ steps.setup.outputs.NO_PUSH }}
-                    --src ${{ steps.setup.outputs.SRC_BRANCH }} 
-                    --deploy ${{ steps.setup.outputs.DEPLOY_BRANCH }} 
+        npm install -g purgecss
+        export JEKYLL_ENV=production
+        bundle exec jekyll build --lsi
+        purgecss -c purgecss.config.js
+    - name: Deploy 🚀
+      if: github.event_name != 'pull_request'
+      uses: JamesIves/github-pages-deploy-action@v4
+      with:
+        folder: _site
+
diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml
@@ -0,0 +1,51 @@
+name: Docker Slim
+
+#Only trigger, when the build workflow succeeded
+on:
+  workflow_run:
+    workflows: ["Docker Image CI"]
+    types:
+      - completed
+
+# on: 
+#   push:
+#     branches: 
+#       - 'master'
+
+jobs: 
+  build:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'alshedivat'
+
+    defaults:
+      run:
+        working-directory: ${{ github.workspace }}
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Login
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+
+    - name: update docker-compose
+      shell: bash
+      run:  |
+        sed -i "s|\.:|${{ github.workspace }}:|g" ${{ github.workspace }}/docker-compose.yml 
+        cat ${{ github.workspace }}/docker-compose.yml 
+        
+    - uses: kitabisa/docker-slim-action@v1.0.3
+      env:
+        DSLIM_PULL: true
+        DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml
+        DSLIM_TARGET_COMPOSE_SVC: jekyll
+        DSLIM_CONTINUE_AFTER: signal
+      with:
+        target: amirpourmand/al-folio
+        tag: "slim"
+
+    # Push to the registry
+    - run: docker image push amirpourmand/al-folio:slim
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,10 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
+    hooks:
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: check-yaml
+    -   id: check-added-large-files
diff --git a/404.html b/404.html
@@ -6,4 +6,4 @@
 redirect: true
 ---
 
-<p>You will be redirected to the main page within 3 seconds. If not redirected, please click <a href="{{ site.baseurl }}/">here</a>.</p>
+<p>You will be redirected to the main page within 3 seconds. If not redirected, please go back to the <a href="{{ site.baseurl }}/">home page</a>.</p>
diff --git a/Dockerfile b/Dockerfile
@@ -1,13 +1,41 @@
-FROM jekyll/jekyll
+FROM ubuntu:latest
+ENV DEBIAN_FRONTEND noninteractive
+
 Label MAINTAINER Amir Pourmand
-#install imagemagick tool for convert command
-RUN apk add --no-cache --virtual .build-deps \
-        libxml2-dev \
-        shadow \
-        autoconf \
-        g++ \
-        make \
-    && apk add --no-cache imagemagick-dev imagemagick
+
+RUN apt-get update -y && apt-get install -y --no-install-recommends \
+    locales \
+    imagemagick \
+    ruby-full \
+    build-essential \
+    zlib1g-dev \
+    jupyter-nbconvert \
+    inotify-tools procps && \
+    apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
+
+
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
+    locale-gen
+
+
+ENV LANG=en_US.UTF-8 \
+    LANGUAGE=en_US:en \
+    LC_ALL=en_US.UTF-8 \
+    JEKYLL_ENV=production
+
+# install jekyll and dependencies
+RUN gem install jekyll bundler
+
+RUN mkdir /srv/jekyll
+
+ADD Gemfile /srv/jekyll
+
 WORKDIR /srv/jekyll
-ADD Gemfile /srv/jekyll/
-RUN bundle install
+
+RUN bundle install --no-cache
+# && rm -rf /var/lib/gems/3.1.0/cache
+EXPOSE 8080
+
+COPY bin/entry_point.sh /tmp/entry_point.sh
+
+CMD ["/tmp/entry_point.sh"]
diff --git a/Gemfile b/Gemfile
@@ -1,23 +1,27 @@
 source 'https://rubygems.org'
 group :jekyll_plugins do
+    gem 'classifier-reborn'
     gem 'jekyll'
     gem 'jekyll-archives'
     gem 'jekyll-diagrams'
     gem 'jekyll-email-protect'
     gem 'jekyll-feed'
+    gem 'jekyll-get-json'
     gem 'jekyll-imagemagick'
+    gem 'jekyll-jupyter-notebook'
+    gem 'jekyll-link-attributes'
     gem 'jekyll-minifier'
     gem 'jekyll-paginate-v2'
     gem 'jekyll-scholar'
     gem 'jekyll-sitemap'
-    gem 'jekyll-target-blank'
+    gem 'jekyll-toc'
     gem 'jekyll-twitter-plugin'
     gem 'jemoji'
     gem 'mini_racer'
     gem 'unicode_utils'
     gem 'webrick'
 end
 group :other_plugins do
-    gem 'httparty'
     gem 'feedjira'
+    gem 'httparty'
 end