From b8a9776a557840366e259fc06eabbe0d02c4f7be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Rudowicz?= Date: Mon, 24 Feb 2025 08:14:50 +0100 Subject: [PATCH] Small fixes, easy serve using the build container image --- .forgejo/workflows/build-jekyll.yml | 4 ++-- Gemfile | 5 ++--- README.md | 2 ++ _sass/libraries/hamburgers/_base.scss | 2 +- _sass/libraries/hamburgers/types/_slider.scss | 2 +- docker/build.Dockerfile | 7 +++++-- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.forgejo/workflows/build-jekyll.yml b/.forgejo/workflows/build-jekyll.yml index 35b25c3..ddbe157 100644 --- a/.forgejo/workflows/build-jekyll.yml +++ b/.forgejo/workflows/build-jekyll.yml @@ -4,7 +4,7 @@ jobs: build_website: runs-on: docker container: - image: git.hswro.org/fleg/hswro_org_build:latest + image: git.hswro.org/hswro/hswro_org_build:latest steps: - uses: actions/checkout@v3 - run: bundle exec jekyll build @@ -18,7 +18,7 @@ jobs: env: REGISTRY_OWNER: hswro container: - image: git.hswro.org/fleg/hswro_org_build:latest + image: git.hswro.org/hswro/hswro_org_build:latest steps: - uses: actions/checkout@v3 - uses: actions/download-artifact@v3 diff --git a/Gemfile b/Gemfile index e4321a1..c7dd12e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,4 @@ source "https://rubygems.org" -gem "webrick", "~> 1.7" -gem "jekyll", "~> 4.3" -gem "jekyll-environment-variables" \ No newline at end of file +gem "webrick", "~> 1.9" +gem "jekyll", "~> 4.4" diff --git a/README.md b/README.md index 3009b09..38e1752 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ Assuming that [you have installed Jekyll properly](https://jekyllrb.com/docs/installation/), run: `bundle exec jekyll serve` +Alternative is to use docker/podman. In the repo directory: `docker run -p="4000:4000" --volume="$PWD:/data:Z" -it hs_wro_build:latest` + ### Doesn't work for me or I'm too lazy to do it Forgejo Actions should generate it for you, then you should be able to download the compressed website ready for viewing locally. diff --git a/_sass/libraries/hamburgers/_base.scss b/_sass/libraries/hamburgers/_base.scss index 30ef6ba..3dff368 100755 --- a/_sass/libraries/hamburgers/_base.scss +++ b/_sass/libraries/hamburgers/_base.scss @@ -57,7 +57,7 @@ .hamburger-inner { display: block; top: 50%; - margin-top: math.div($hamburger-layer-height, -2); + margin-top: calc($hamburger-layer-height / -2); &, &::before, diff --git a/_sass/libraries/hamburgers/types/_slider.scss b/_sass/libraries/hamburgers/types/_slider.scss index 9c489a4..93b262b 100755 --- a/_sass/libraries/hamburgers/types/_slider.scss +++ b/_sass/libraries/hamburgers/types/_slider.scss @@ -27,7 +27,7 @@ transform: translate3d(0, $y-offset, 0) rotate(45deg); &::before { - transform: rotate(-45deg) translate3d(math.div($hamburger-layer-width, -7), $hamburger-layer-spacing * -1, 0); + transform: rotate(-45deg) translate3d(calc($hamburger-layer-width / -7), $hamburger-layer-spacing * -1, 0); opacity: 0; } diff --git a/docker/build.Dockerfile b/docker/build.Dockerfile index 61adc1a..1c1d517 100644 --- a/docker/build.Dockerfile +++ b/docker/build.Dockerfile @@ -6,6 +6,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ git nodejs git buildah \ && rm -rf /var/lib/apt/lists/* \ && gem install --no-document jekyll -v 4.4.1 \ - && gem install --no-document jekyll-environment-variables \ - && gem install --no-document webrick -v 1.7 \ + && gem install --no-document webrick -v 1.9 \ && gem install bundler + +EXPOSE 4000 +WORKDIR /data +CMD bundle install && bundle exec jekyll serve --verbose --host 0.0.0.0