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

Ruby 3.2.2 alpine3.18, Jekyll v4.3.2 #369

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 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
d013275
base_image: ruby:3.2.2-alpine3.18
JV-conseil Aug 28, 2023
e7cf8e5
ruby/setup-ruby@v1 & docker/login-action@v2
JV-conseil Aug 28, 2023
ea94160
bundle exec docker-template build $DOCKER_REPO --no-push --force --sq…
JV-conseil Aug 29, 2023
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
12 changes: 8 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,20 @@ jobs:
- jekyll:pages
steps:
- uses: actions/checkout@v3
- uses: actions/setup-ruby@v1

- uses: ruby/setup-ruby@v1
with:
ruby-version: '2.x'
bundler-cache: true # runs 'bundle install' and caches installed gems automatically

- run: bundle install

- run: |
echo $'{\n "experimental": true\n}' | \
sudo tee /etc/docker/daemon.json
sudo systemctl restart docker
name: 'docker experimental'
- run: docker-template build $DOCKER_REPO --no-push --force --squash

- run: bundle exec docker-template build $DOCKER_REPO --no-push --force --squash
env:
RUBYOPT: "-W0"
DOCKER_REPO: "${{join(matrix.env, ' ')}}"
DOCKER_REPO: "${{ join(matrix.env, ' ') }}"
34 changes: 21 additions & 13 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ jobs:
matrix:
env:
-
- jekyll:4.2.2
- jekyll:4.3.2
- jekyll:stable
- jekyll:latest
- jekyll:4.0
- jekyll:4
-
- builder:4.2.2
- builder:4.3.2
- builder:stable
- builder:latest
- builder:4.0
- builder:4
-
- minimal:4.2.2
- minimal:4.3.2
- minimal:stable
- minimal:latest
- minimal:4.0
Expand All @@ -37,23 +37,31 @@ jobs:
- jekyll:pages
steps:
- uses: actions/checkout@v3
- uses: actions/setup-ruby@v1

- uses: ruby/setup-ruby@v1
with:
ruby-version: '2.x'
bundler-cache: true # runs 'bundle install' and caches installed gems automatically

- 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
uses: docker/login-action@v2
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, ' ')}}"
DOCKER_REPO: "${{ join(matrix.env, ' ') }}"
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.0
2.7.8
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
# --
env: "\
DOCKER_REPO='\
jekyll:4.2.2 \
jekyll:4.3.2 \
jekyll:stable \
jekyll:latest \
jekyll:pages \
Expand All @@ -43,7 +43,7 @@ jobs:
# --
- env: "\
DOCKER_REPO='\
builder:4.2.2 \
builder:4.3.2 \
builder:stable \
builder:latest \
jekyll:builder \
Expand All @@ -57,7 +57,7 @@ jobs:
# --
- env: "\
DOCKER_REPO='\
minimal:4.2.2 \
minimal:4.3.2 \
minimal:stable \
minimal:latest \
jekyll:minimal \
Expand Down
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
source "https://rubygems.org"

ruby File.read('.ruby-version').strip

gem "docker-template"

group :development do
gem 'envygeeks-rubocop'
gem "envygeeks-rubocop"
unless ENV["CI"] == "true"
gem "travis"
gem "pry"
Expand Down
15 changes: 8 additions & 7 deletions opts.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
base_image: ruby:3.1.1-alpine3.15
base_image: ruby:3.2.2-alpine3.18
user: jekyll
aliases:
latest: 4.2.2
stable: 4.2.2
4.0: 4.2.2
4: 4.2.2
latest: 4.3.2
stable: 4.3.2
4.0: 4.3.2
4: 4.3.2
tags:
4.2.2: stable
4.3.2: stable
pages: pages
releases:
tag:
pages: 3.8.5 # 05-15-2020
# pages: 3.8.5 # 05-15-2020
pages: 3.9.0 # 27.08.2023