Skip to content

Commit 663ab55

Browse files
committed
Merge branch 'al-folio-main'
2 parents 66530f7 + 93aeb6d commit 663ab55

File tree

3 files changed

+38
-6
lines changed

3 files changed

+38
-6
lines changed

CUSTOMIZE.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ The project is structured as follows, focusing on the main components that you w
1616
├── 📂 _bibliography/
1717
│   └── 📄 papers.bib: bibliography in BibTeX format
1818
├── 📂 _books/: contains the bookshelf pages
19+
│ └── 📂 LANG/: must have one for each language defined in _config.yml
1920
├── 📄 _config.yml: the configuration file of the template
2021
├── 📂 _data/: contains some of the data used in the template
2122
│ ├── 📂 LANG/: data for the LANG version. Must have one for each language defined in _config.yml
@@ -86,7 +87,7 @@ You can add news in the about page by adding new Markdown files in the [\_news/L
8687

8788
This Jekyll theme implements [collections](https://jekyllrb.com/docs/collections/) to let you break up your work into categories. The theme comes with three default collections: `news`, `projects`, and `books`. Items from the `news` collection are automatically displayed on the home page, while items from the `projects` collection are displayed on a responsive grid on projects page and items from the `books` collection are displayed on its own `bookshelf` page inside `submenus`.
8889

89-
You can easily create your own collections, apps, short stories, courses, or whatever your creative work is. To do this, edit the collections in the [\_config.yml](_config.yml) file, create a corresponding folder, and create a landing page for your collection, similar to [\_pages/LANG/projects.md](_pages/en-us/projects.md).
90+
You can easily create your own collections, apps, short stories, courses, or whatever your creative work is. To do this, edit the collections in the [\_config.yml](_config.yml) file, create a corresponding folder, and create a landing page for your collection, similar to [\_pages/projects.md](_pages/projects.md).
9091

9192
If you wish to create a collection with support for categories and tags, like the blog posts, you just need to add this collection to the `jekyll-archives` section of your [\_config.yml](_config.yml) file. You can check how this is done with the `books` collection. For more information about customizing the archives section or creating your own archives page, check the [jekyll-archives-v2 documentation](https://george-gca.github.io/jekyll-archives-v2/).
9293

@@ -174,7 +175,7 @@ Depending on your specified footer behavior, the sign up form either will appear
174175
Since this template have a lot of content, you may want to remove some of it. The easiest way to achieve this and avoid merge conflicts when updating your code (as [pointed by CheariX ](https://github.com/alshedivat/al-folio/pull/2933#issuecomment-2571271117)) is to add the unwanted files to the `excludes` section in your `_config.yml` file instead of actually deleting them, for example:
175176

176177
```yml
177-
excludes:
178+
exclude:
178179
- _news/**/announcement_*.md
179180
- _pages/**/blog.md
180181
- _posts/
@@ -198,9 +199,9 @@ You can also:
198199

199200
- delete [\_includes/latest_posts.liquid](_includes/latest_posts.liquid)
200201
- delete [\_includes/related_posts.liquid](_includes/related_posts.liquid)
201-
- delete [\_layouts/archive.liquid](_layouts/archive.liquid)
202+
- delete [\_layouts/archive.liquid](_layouts/archive.liquid) (unless you have a custom collection that uses it)
202203
- delete [\_plugins/external-posts.rb](_plugins/external-posts.rb)
203-
- remove the `jekyll-archives` gem from the [Gemfile](Gemfile) and the `plugins` section in [\_config.yml](_config.yml)
204+
- remove the `jekyll-archives-v2` gem from the [Gemfile](Gemfile) and the `plugins` section in [\_config.yml](_config.yml) (unless you have a custom collection that uses it)
204205
- remove the `classifier-reborn` gem from the [Gemfile](Gemfile)
205206

206207
### Removing the news section

INSTALL.md

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
- [Local setup on Windows](#local-setup-on-windows)
77
- [Local setup using Docker (Recommended)](#local-setup-using-docker-recommended)
88
- [Build your own docker image](#build-your-own-docker-image)
9+
- [Have Bugs on Docker Image?](#have-bugs-on-docker-image)
910
- [Local Setup with Development Containers](#local-setup-with-development-containers)
1011
- [Local Setup (Legacy, no longer supported)](#local-setup-legacy-no-longer-supported)
1112
- [Deployment](#deployment)
@@ -76,6 +77,36 @@ $ docker compose up --build
7677
7778
If you want to use a specific docker version, you can do so by changing `latest` tag to `your_version` in `docker-compose.yaml`. For example, you might have created your website on `v0.10.0` and you want to stick with that.
7879

80+
### Have Bugs on Docker Image?
81+
82+
Sometimes, there might be some bugs in the current docker image. It might be version mismatch or anything. If you want to debug and easily solve the problem for yourself you can do the following steps:
83+
84+
```
85+
docker compose up -d
86+
docker compose logs
87+
```
88+
89+
Then you can see the bug! You can enter the container via this command:
90+
91+
```
92+
docker compose exec -it jekyll /bin/bash
93+
```
94+
95+
Then you can run the script:
96+
97+
```
98+
./bin/entry_point.sh
99+
```
100+
101+
You might see problems for package dependecy or something which is not available. You can fix it now by using
102+
103+
```
104+
bundle install
105+
./bin/entry_point.sh
106+
```
107+
108+
Most likely, this will solve the problem but it shouldn't really happen. So, please open a bug report for us.
109+
79110
## Local Setup with Development Containers
80111

81112
`al-folio` supports [Development Containers](https://containers.dev/supporting).
@@ -211,7 +242,7 @@ If you installed **multi-language-al-folio** as described above, you can manuall
211242
# Assuming the current directory is <your-repo-name>
212243
$ git remote add upstream https://github.com/george-gca/multi-language-al-folio.git
213244
$ git fetch upstream
214-
$ git rebase v1.14.2
245+
$ git rebase v1.14.3
215246
```
216247

217248
If you have extensively customized a previous version, it might be trickier to upgrade.

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# this file uses prebuilt image in dockerhub
22
services:
33
jekyll:
4-
image: georgegca/multi-language-al-folio:v1.14.2
4+
image: georgegca/multi-language-al-folio:v1.14.3
55
build: .
66
# uncomment these if you are having this issue with the build:
77
# /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)

0 commit comments

Comments
 (0)