Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 6 deletions .github/workflows/check-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
name: debian
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

# setup ruby
- uses: ruby/setup-ruby@v1
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
runs-on: ubuntu-latest
needs: debian
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

# setup ruby
- uses: ruby/setup-ruby@v1
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
name: debian-trixie
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

# setup ruby
- uses: ruby/setup-ruby@v1
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
runs-on: ubuntu-latest
needs: debian-trixie
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

# setup ruby
- uses: ruby/setup-ruby@v1
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
name: debian-bookworm
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

# setup ruby
- uses: ruby/setup-ruby@v1
Expand Down Expand Up @@ -223,7 +223,7 @@ jobs:
runs-on: ubuntu-latest
needs: debian-bookworm
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

# setup ruby
- uses: ruby/setup-ruby@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-update.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
needs: <%= image.sub(/^baseimage/, 'debian') %>
<%- end -%>
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

# setup ruby
- uses: ruby/setup-ruby@v1
Expand Down
38 changes: 19 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:

- uses: actions/checkout@v5
- uses: actions/checkout@v6

# setup ruby
- uses: ruby/setup-ruby@v1
Expand All @@ -31,7 +31,7 @@ jobs:
- run: sudo apt-get install -y --no-install-recommends pigz

# build image
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- run: docker build -t minimum2scp/baseimage:latest baseimage

# setup ruby
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
- run: pigz -c -d /tmp/baseimage.tar.gz | docker load

# build image
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- run: docker build -t minimum2scp/ruby:latest ruby

# setup ruby
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
- run: pigz -c -d /tmp/baseimage.tar.gz | docker load

# build image
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- run: docker build -t minimum2scp/nodejs:latest nodejs

# setup ruby
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
- run: pigz -c -d /tmp/baseimage.tar.gz | docker load

# build image
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- run: docker build -t minimum2scp/es-kibana:latest es-kibana

# setup ruby
Expand Down Expand Up @@ -176,7 +176,7 @@ jobs:
- run: pigz -c -d /tmp/baseimage.tar.gz | docker load

# build image
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- run: docker build -t minimum2scp/systemd:latest systemd

# setup ruby
Expand Down Expand Up @@ -210,7 +210,7 @@ jobs:
- run: pigz -c -d /tmp/baseimage.tar.gz | docker load

# build image
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- run: docker build -t minimum2scp/squid:latest squid

# setup ruby
Expand Down Expand Up @@ -244,7 +244,7 @@ jobs:
- run: pigz -c -d /tmp/ruby.tar.gz | docker load

# build image
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- run: docker build -t minimum2scp/norikra:latest norikra

# setup ruby
Expand Down Expand Up @@ -278,7 +278,7 @@ jobs:
- run: pigz -c -d /tmp/ruby.tar.gz | docker load

# build image
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- run: docker build -t minimum2scp/ruby-full:latest ruby-full

# setup ruby
Expand Down Expand Up @@ -312,7 +312,7 @@ jobs:
- run: pigz -c -d /tmp/ruby.tar.gz | docker load

# build image
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- run: docker build -t minimum2scp/rails7:latest rails7

# setup ruby
Expand Down Expand Up @@ -346,7 +346,7 @@ jobs:
- run: pigz -c -d /tmp/ruby.tar.gz | docker load

# build image
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- run: docker build -t minimum2scp/tdiary:latest tdiary

# setup ruby
Expand All @@ -371,7 +371,7 @@ jobs:
runs-on: ubuntu-latest
steps:

- uses: actions/checkout@v5
- uses: actions/checkout@v6

# setup ruby
- uses: ruby/setup-ruby@v1
Expand All @@ -394,7 +394,7 @@ jobs:
- run: sudo apt-get install -y --no-install-recommends pigz

# build image
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- run: docker build -t minimum2scp/baseimage-trixie:latest baseimage-trixie

# setup ruby
Expand Down Expand Up @@ -431,7 +431,7 @@ jobs:
- run: pigz -c -d /tmp/baseimage-trixie.tar.gz | docker load

# build image
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- run: docker build -t minimum2scp/ruby-trixie:latest ruby-trixie

# setup ruby
Expand Down Expand Up @@ -465,7 +465,7 @@ jobs:
- run: pigz -c -d /tmp/baseimage-trixie.tar.gz | docker load

# build image
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- run: docker build -t minimum2scp/systemd-trixie:latest systemd-trixie

# setup ruby
Expand All @@ -490,7 +490,7 @@ jobs:
runs-on: ubuntu-latest
steps:

- uses: actions/checkout@v5
- uses: actions/checkout@v6

# setup ruby
- uses: ruby/setup-ruby@v1
Expand All @@ -513,7 +513,7 @@ jobs:
- run: sudo apt-get install -y --no-install-recommends pigz

# build image
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- run: docker build -t minimum2scp/baseimage-bookworm:latest baseimage-bookworm

# setup ruby
Expand Down Expand Up @@ -550,7 +550,7 @@ jobs:
- run: pigz -c -d /tmp/baseimage-bookworm.tar.gz | docker load

# build image
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- run: docker build -t minimum2scp/ruby-bookworm:latest ruby-bookworm

# setup ruby
Expand Down Expand Up @@ -584,7 +584,7 @@ jobs:
- run: pigz -c -d /tmp/baseimage-bookworm.tar.gz | docker load

# build image
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- run: docker build -t minimum2scp/systemd-bookworm:latest systemd-bookworm

# setup ruby
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ images = {
<%- end -%>
<%- if image_conf[:build_image] -%>
# build image
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- run: docker build -t minimum2scp/<%= image %>:latest <%= image %>
<%- else -%>
- uses: actions/checkout@v5
- uses: actions/checkout@v6
<%- end -%>

# setup ruby
Expand Down