Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minimal #374

Open
wants to merge 61 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
c884665
ruby:3.1.4-alpine3.18
JV-conseil Aug 25, 2023
c705bcb
Markdown formatting
JV-conseil Aug 25, 2023
cc17b8b
DOCKER_USERNAME=jvconseil
JV-conseil Aug 25, 2023
116ed4d
Update codeowners
JV-conseil Aug 25, 2023
5d4c4e2
Update codeowners
JV-conseil Aug 25, 2023
0d91293
Merge pull request #1 from JV-conseil/ruby3.1.4-alpine3.18
JV-conseil Aug 25, 2023
563b2b1
Update codeowners
JV-conseil Aug 25, 2023
46aba38
ruby/setup-ruby@v1
JV-conseil Aug 25, 2023
f528b68
Merge pull request #3 from JV-conseil/ruby3.1.4-alpine3.18
JV-conseil Aug 25, 2023
0a1ee49
Update README.md
JV-conseil Aug 25, 2023
48780a6
Update deploy.yml
JV-conseil Aug 25, 2023
e9edc33
Update deploy.yml
JV-conseil Aug 25, 2023
6939bc9
Update deploy.yml
JV-conseil Aug 25, 2023
d671b2d
Update deploy.yml
JV-conseil Aug 25, 2023
1fe1c5e
jekyll:4.2.2
JV-conseil Aug 26, 2023
aff6cac
base_image: ruby:3.2.2-alpine3.18
JV-conseil Aug 26, 2023
5aa8cd3
Update README.md
JV-conseil Aug 26, 2023
3f9193c
.github/workflows/build.yml
JV-conseil Aug 26, 2023
54e5367
Update build.yml
JV-conseil Aug 26, 2023
06d7be3
Update build.yml
JV-conseil Aug 26, 2023
779b9a3
.github/workflows/build.yml
JV-conseil Aug 26, 2023
0267256
repos/jekyll-docker/copy
JV-conseil Aug 26, 2023
cd8392c
.ruby-version
JV-conseil Aug 27, 2023
fe529ec
Update deploy.yml
JV-conseil Aug 27, 2023
006ec62
Update deploy.yml
JV-conseil Aug 27, 2023
da3366d
Update opts.yml
JV-conseil Aug 27, 2023
1511e58
cron: "0 4 1 * *"
JV-conseil Aug 27, 2023
f690c4a
Update deploy.yml
JV-conseil Aug 28, 2023
343013b
Update README.md
JV-conseil Aug 28, 2023
beb16aa
Update README.md
JV-conseil Sep 2, 2023
d4d5dc8
semver
JV-conseil Sep 4, 2023
de5dfff
base_image: ruby:3.1-alpine
JV-conseil Sep 4, 2023
23d4ac6
FROM ruby:3.2-alpine
JV-conseil Sep 4, 2023
56dddd2
base_image: ruby:3-alpine
JV-conseil Sep 4, 2023
8a544f2
Update README.md
JV-conseil Nov 10, 2023
612eea1
Update to Jekyll v4.3.3
JV-conseil Jan 4, 2024
e69f110
invalid option: --use-system-libraries
JV-conseil Jan 4, 2024
77b9001
Update Dockerfile
JV-conseil Jan 4, 2024
50b80c4
Revert "Update Dockerfile"
JV-conseil Jan 4, 2024
a8b87c1
Update Dockerfile
JV-conseil Jan 4, 2024
8bfabdf
Update Dockerfile
JV-conseil Jan 4, 2024
f112236
ln -s ../jekyll-docker/Dockerfile
JV-conseil Jan 5, 2024
59b44ae
rm -vrf "./Gemfile.lock" in _jvcl_::bundle_update
JV-conseil Apr 15, 2024
03f4cd4
Deploy #53
JV-conseil Jul 8, 2024
a8a1a49
Dockerfile
JV-conseil Jan 30, 2025
6ba7a53
ERROR: failed to calculate checksum of ref dbd19ac3-744c-4735-9d96-20…
JV-conseil Jan 30, 2025
418f7da
docker/setup-buildx-action@v3
JV-conseil Jan 30, 2025
af8abf5
Dockerfile
JV-conseil Jan 30, 2025
7a15615
Update Dockerfile
JV-conseil Jan 30, 2025
a150096
Update Dockerfile
JV-conseil Jan 30, 2025
45624b0
ERROR: Failed to build gem native extension.
JV-conseil Jan 30, 2025
f6d04ad
Update Dockerfile
JV-conseil Jan 30, 2025
1960f6b
.ruby_version
JV-conseil Jan 30, 2025
2eb2646
Update Dockerfile
JV-conseil Jan 30, 2025
0a05dcd
/Users/julien_vieillefont/GitHub/JV-conseil/jekyll-docker/Dockerfile
JV-conseil Jan 30, 2025
a7ad28e
uses: ruby/setup-ruby@v1
JV-conseil Jan 30, 2025
d151e00
.ruby-version
JV-conseil Jan 30, 2025
933fee0
Packages Dev
JV-conseil Jan 30, 2025
e3f984d
context: .
JV-conseil Jan 31, 2025
abe16fa
Update tasks.json
JV-conseil Jan 31, 2025
8a3e623
Update tasks.json
JV-conseil Jan 31, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions .bash/docker.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#!/usr/bin/env bash
#
# Script Name : docker.sh
# Description : ...
# Created : January 30, 2025
# Author : JV-conseil
# Contact : [email protected]
# Website : https://www.jv-conseil.dev
# Copyright : (c) 2025 JV-conseil
# All rights reserved
# ========================================================

set -Eeou pipefail
shopt -s failglob

_jvcl_::dockerfile_reverse_engineer() {
local _image="${1:-jvconseil/jekyll-docker:latest}" _dump="./DockerfileReverseEngineer.txt"
docker history --no-trunc --format='table {{.CreatedBy}}' "${_image}" |
tail -r |
sed -E 's~/bin/sh -c #\(nop\) +~~g; s~/bin/sh -c~RUN~g;' \
>"${_dump}"
}

_jvcl_::update_dockerfile() {
local _comit _jekyll=4.4.1

_comit=$(git rev-parse --verify HEAD)

sed -i '' -E "s~^ENV JEKYLL_DOCKER_COMMIT=[a-z0-9]+$~ENV JEKYLL_DOCKER_COMMIT=${_comit}~g" ./Dockerfile &&
printf "ENV JEKYLL_DOCKER_COMMIT=%s\n" "${_comit}"

sed -i '' -E "s~^ENV JEKYLL_VERSION=[0-9.]+$~ENV JEKYLL_VERSION=${_jekyll}~g" ./Dockerfile &&
printf "ENV JEKYLL_VERSION=%s\n" "${_jekyll}"
}

_jvcl_::dockerfile_reverse_engineer "$@"

7 changes: 6 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,9 @@ yarn.lock
#
# Git
#
/.git
/.git
_deprecated
/*.txt
/.bash
/.github
/.vscode
9 changes: 0 additions & 9 deletions .editorconfig

This file was deleted.

1 change: 0 additions & 1 deletion .github/FUNDING.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/codeowners
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @envygeeks
* @JV-conseil
6 changes: 0 additions & 6 deletions .github/dependabot.yml

This file was deleted.

1 change: 0 additions & 1 deletion .github/security

This file was deleted.

42 changes: 42 additions & 0 deletions .github/workflows-disabled/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Deploy to Docker Hub
# See <https://github.com/marketplace/actions/jekyll-builder-for-github-pages>
# Copyright (c) 2019-2023 JV-conseil, All rights reserved
name: "Build"

on: pull-request

jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 360

name: "Build"

strategy:
matrix:
env:
# - jekyll:latest
# - jekyll-minimal:latest
# - jekyll:pages
- jekyll-docker:latest

steps:
- uses: actions/checkout@v3

- name: "Setup Ruby"
uses: ruby/setup-ruby@v1
with:
bundler-cache: true # runs 'bundle install' and caches installed gems automatically

- run: bundle install

- name: "Docker Experimental"
run: |
echo $'{\n "experimental": true\n}' | \
sudo tee /etc/docker/daemon.json
sudo systemctl restart docker

- run: bundle exec docker-template build $DOCKER_REPO --no-push --force --squash
env:
RUBYOPT: "-W0"
DOCKER_REPO: "${{join(matrix.env, ' ')}}"
63 changes: 63 additions & 0 deletions .github/workflows-disabled/deploy copy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# Deploy to Docker Hub
# See <https://hub.docker.com/repository/docker/jvconseil/jekyll-docker/general>
# Copyright (c) 2019-2023 JV-conseil, All rights reserved
name: "Deploy"

on:
push:
branches:
- main
schedule:
# “At 04:00 on day-of-month 1.” See <https://crontab.guru/#0_4_1_*_*>
# * is a special character in YAML so you have to quote this string
- cron: "0 4 1 * *"

jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 360

name: "Deploy"

strategy:
fail-fast: false
matrix:
env:
- - jekyll-docker:4.4.1
- jekyll-docker:stable
- jekyll-docker:latest
- jekyll-docker:4.0
- jekyll-docker:4

steps:
- uses: actions/checkout@v3

- name: "Setup Ruby"
uses: ruby/setup-ruby@v1
with:
bundler-cache: true # runs 'bundle install' and caches installed gems automatically

- run: bundle install

- name: "Docker Experimental"
run: |
echo $'{\n "experimental": true\n}' | \
sudo tee /etc/docker/daemon.json
sudo systemctl restart docker

- name: "Login to Docker Hub"
# uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- run: bundle exec docker-template build $DOCKER_REPO --no-push --force --squash
env:
RUBYOPT: "-W0"
DOCKER_REPO: "${{ join(matrix.env, ' ') }}"

- run: bundle exec docker-template push $DOCKER_REPO
env:
RUBYOPT: "-W0"
DOCKER_REPO: "${{ join(matrix.env, ' ') }}"
30 changes: 0 additions & 30 deletions .github/workflows/build.yml

This file was deleted.

90 changes: 41 additions & 49 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,59 +1,51 @@
name: 'Push'
# Deploy to Docker Hub
# See <https://hub.docker.com/repository/docker/jvconseil/jekyll-docker/general>
# Copyright (c) 2019-2023 JV-conseil, All rights reserved
name: "Publish Docker image"

on:
push:
branches:
- $default-branch
- main
schedule:
- cron: 2 4 10 * *
# “At 04:00 on day-of-month 1.” See <https://crontab.guru/#0_4_1_*_*>
# * is a special character in YAML so you have to quote this string
- cron: "0 4 1 * *"

jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 360
name: 'Build'
strategy:
fail-fast: false
matrix:
env:
-
- jekyll:4.2.2
- jekyll:stable
- jekyll:latest
- jekyll:4.0
- jekyll:4
-
- builder:4.2.2
- builder:stable
- builder:latest
- builder:4.0
- builder:4
-
- minimal:4.2.2
- minimal:stable
- minimal:latest
- minimal:4.0
- minimal:4
- builder:pages
- minimal:pages
- jekyll:pages

name: "Deploy"

steps:
- uses: actions/checkout@v3
- uses: actions/setup-ruby@v1
- name: Check out the repo
uses: actions/checkout@v4

- name: Log in to Docker Hub
uses: docker/login-action@v3
with:
ruby-version: '2.x'
- run: bundle install
- run: |
echo $'{\n "experimental": true\n}' | \
sudo tee /etc/docker/daemon.json
sudo systemctl restart docker
name: 'docker experimental'
- name: 'docker login'
run: |
echo "${{secrets.DOCKER_PASSWORD}}" | docker login \
--username ${{secrets.DOCKER_USERNAME}} \
--password-stdin
- run: |
docker-template build $DOCKER_REPO --no-push --force --squash
docker-template push $DOCKER_REPO
env:
RUBYOPT: "-W0"
DOCKER_REPO: "${{join(matrix.env, ' ')}}"
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: "Setup Ruby"
uses: ruby/setup-ruby@v1
with:
bundler-cache: true # runs 'bundle install' and caches installed gems automatically

- name: Build and push Docker image
id: push
uses: docker/build-push-action@v6
with:
context: .
# file: ./Dockerfile
push: true
tags: user/app:latest
labels: user/app:latest
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,10 @@ yarn.lock
# Editor
#
/.idea

#
# Git
#
/.git
_deprecated
/*.txt
7 changes: 0 additions & 7 deletions .rubocop.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.0
3.4.1
Loading