Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit b3f1e19
Merge: 72650fe 7e2ffbb
Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com>
Date:   Thu Nov 30 23:53:50 2023 +0100

    Merge pull request pelican-eggs#209 from MarcoCoreDuo/java-21-tini

    Add tini to java 21 Dockerfile

commit 7e2ffbb
Author: MarcoCoreDuo <90222533+MarcoCoreDuo@users.noreply.github.com>
Date:   Thu Nov 30 22:37:59 2023 +0100

    Add tini to java 21 Dockerfile

commit 72650fe
Merge: fa14c76 5023aa8
Author: Michael (Parker) Parker <parkervcp@gmail.com>
Date:   Sun Nov 19 12:37:05 2023 -0500

    Merge pull request pelican-eggs#204 from parkervcp/tini-2

    Add tini to some more images + fix Postgress stop

commit fa14c76
Merge: f751694 dc52a6b
Author: Michael (Parker) Parker <parkervcp@gmail.com>
Date:   Sun Nov 19 12:36:17 2023 -0500

    Merge pull request pelican-eggs#203 from parkervcp/fixes

    Fixes images build + update workflow actions

commit f751694
Merge: fa5c4c1 f841911
Author: Michael (Parker) Parker <parkervcp@gmail.com>
Date:   Sat Nov 18 20:37:29 2023 -0500

    Merge pull request pelican-eggs#206 from Senaris/master

    Add dotnet_8

commit f841911
Author: Tita Junior Radu <Senaris@users.noreply.github.com>
Date:   Sun Nov 19 03:08:44 2023 +0200

    Add dotnet_8

commit dc52a6b
Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com>
Date:   Sat Nov 18 18:52:06 2023 +0100

    Update all workflow actions

commit fa5c4c1
Merge: 3dc42eb 89d6a83
Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com>
Date:   Sat Nov 18 18:45:16 2023 +0100

    Merge pull request pelican-eggs#205 from Senaris/master

    Add dotnet 8

commit 5023aa8
Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com>
Date:   Sat Nov 18 18:42:27 2023 +0100

    install tini

commit a02fea5
Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com>
Date:   Sat Nov 18 14:18:35 2023 +0100

    add tini to dayz

commit 71f1752
Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com>
Date:   Sat Nov 18 14:16:12 2023 +0100

    Add tini and more packages to postgres

commit 89d6a83
Author: Senaris <senarisk@gmail.com>
Date:   Fri Nov 17 02:12:48 2023 +0200

    dotnet 8

commit 535e9f9
Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com>
Date:   Sat Nov 11 10:38:14 2023 +0100

    add tini: Valheim

commit ddce841
Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com>
Date:   Sat Nov 11 10:34:10 2023 +0100

    add tini: elixir

commit 816a447
Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com>
Date:   Sat Nov 11 10:32:24 2023 +0100

    add forgoten STOPSIGNAL to uptimekuma

commit 3ef00bd
Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com>
Date:   Sat Nov 11 10:31:42 2023 +0100

    add tini to bun

commit 83436eb
Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com>
Date:   Sat Nov 11 10:29:52 2023 +0100

    add tini: Uptimekuma

commit e638f58
Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com>
Date:   Wed Nov 1 20:17:41 2023 +0100

    Rust: stop building 1.31

commit f226560
Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com>
Date:   Wed Nov 1 20:15:57 2023 +0100

    redbot: do not install discord-text-sanitizer

commit c523dc5
Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com>
Date:   Wed Nov 1 20:15:32 2023 +0100

    Update bastion
  • Loading branch information
darksaid98 committed Dec 2, 2023
1 parent 4ca2b6a commit dee5016
Show file tree
Hide file tree
Showing 42 changed files with 231 additions and 153 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/apps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
app:
- uptimekuma
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: docker/setup-qemu-action@v3

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ jobs:
- debian
- ubuntu
steps:
- uses: actions/checkout@v3
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-buildx-action@v2
- uses: actions/checkout@v4
- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3
with:
buildkitd-flags: --debug
- uses: docker/login-action@v2
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./oses/${{ matrix.oses }}
file: ./oses/${{ matrix.oses }}/Dockerfile
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/box64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ jobs:
tag:
- box64
steps:
- uses: actions/checkout@v3
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-buildx-action@v2
- uses: actions/checkout@v4
- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3
with:
buildkitd-flags: --debug
- uses: docker/login-action@v2
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./box64
file: ./${{ matrix.tag }}/Dockerfile
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/bun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ jobs:
- latest
- canary
steps:
- uses: actions/checkout@v3
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-buildx-action@v2
- uses: actions/checkout@v4
- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3
with:
buildkitd-flags: --debug
- uses: docker/login-action@v2
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./bun
file: ./bun/${{ matrix.tag }}/Dockerfile
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/cassandra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ jobs:
- java8_python2
- java11_python3
steps:
- uses: actions/checkout@v3
- uses: docker/setup-buildx-action@v2
- uses: actions/checkout@v4
- uses: docker/setup-buildx-action@v3
with:
buildkitd-flags: --debug
- uses: docker/login-action@v2
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./cassandra
file: ./cassandra/${{ matrix.tag }}/Dockerfile
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/dart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ jobs:
steps:
- uses: actions/checkout@v3
# Setup QEMU for ARM64 Build
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-buildx-action@v2
- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3
with:
buildkitd-flags: --debug
- uses: docker/login-action@v2
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./dart
file: ./dart/${{ matrix.tag }}/Dockerfile
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,20 @@ jobs:
- 5
- 6
- 7
- 8
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
# Setup QEMU for ARM64 Build
- uses: docker/setup-qemu-action@v1
- uses: docker/setup-buildx-action@v2
- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3
with:
buildkitd-flags: --debug
- uses: docker/login-action@v2
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./dotnet
file: ./dotnet/${{ matrix.tag }}/Dockerfile
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/elixir.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ jobs:
- '1.12'
- latest
steps:
- uses: actions/checkout@v3
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-buildx-action@v2
- uses: actions/checkout@v4
- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3
with:
buildkitd-flags: --debug
- uses: docker/login-action@v2
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./elixir
file: ./elixir/${{ matrix.tag }}/Dockerfile
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/erlang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ jobs:
- 25
- 26
steps:
- uses: actions/checkout@v3
- uses: docker/setup-buildx-action@v2
- uses: actions/checkout@v4
- uses: docker/setup-buildx-action@v3
with:
buildkitd-flags: --debug
- uses: docker/login-action@v2
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./erlang
file: ./erlang/${{ matrix.tag }}/Dockerfile
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/games.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ jobs:
- source

steps:
- uses: actions/checkout@v3
- uses: docker/setup-buildx-action@v2
- uses: actions/checkout@v4
- uses: docker/setup-buildx-action@v3
with:
buildkitd-flags: --debug
- uses: docker/login-action@v2
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./games/${{ matrix.game }}
file: ./games/${{ matrix.game }}/Dockerfile
Expand All @@ -53,20 +53,20 @@ jobs:
- mta
- valheim
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
with:
platforms: arm64,amd64
- uses: docker/setup-buildx-action@v2
- uses: docker/setup-buildx-action@v3
with:
buildkitd-flags: --debug
- uses: docker/login-action@v2
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./games/${{ matrix.game }}
file: ./games/${{ matrix.game }}/Dockerfile
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ jobs:
- '1.20'
- '1.21'
steps:
- uses: actions/checkout@v3
- uses: docker/setup-buildx-action@v2
- uses: actions/checkout@v4
- uses: docker/setup-buildx-action@v3
with:
buildkitd-flags: --debug
- uses: docker/login-action@v2
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./go
file: ./go/${{ matrix.tag }}/Dockerfile
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/installers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ jobs:
- debian
- ubuntu
steps:
- uses: actions/checkout@v3
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-buildx-action@v2
- uses: actions/checkout@v4
- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3
with:
buildkitd-flags: --debug
- uses: docker/login-action@v2
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./installers
file: ./installers/${{ matrix.tag }}/Dockerfile
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ jobs:
- 19
- 21
steps:
- uses: actions/checkout@v3
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-buildx-action@v2
- uses: actions/checkout@v4
- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3
with:
buildkitd-flags: --debug
- uses: docker/login-action@v2
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./java
file: ./java/${{ matrix.tag }}/Dockerfile
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/mariadb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ jobs:
- '10.6'
- '10.7'
steps:
- uses: actions/checkout@v3
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-buildx-action@v2
- uses: actions/checkout@v4
- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3
with:
buildkitd-flags: --debug
- uses: docker/login-action@v2
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./mariadb
file: ./mariadb/${{ matrix.tag }}/Dockerfile
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/mongodb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ jobs:
- 5
- 6
steps:
- uses: actions/checkout@v3
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-buildx-action@v2
- uses: actions/checkout@v4
- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3
with:
buildkitd-flags: --debug
- uses: docker/login-action@v2
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./mongodb
file: ./mongodb/${{ matrix.tag }}/Dockerfile
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/mono.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ jobs:
tag:
- latest
steps:
- uses: actions/checkout@v3
- uses: docker/setup-buildx-action@v2
- uses: actions/checkout@v4
- uses: docker/setup-buildx-action@v3
with:
buildkitd-flags: --debug
- uses: docker/login-action@v2
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./mono
file: ./mono/${{ matrix.tag }}/Dockerfile
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ jobs:
- 19
- 20
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
# Setup QEMU for ARM64 Build
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-buildx-action@v2
- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3
with:
buildkitd-flags: --debug
- uses: docker/login-action@v2
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./nodejs
file: ./nodejs/${{ matrix.tag }}/Dockerfile
Expand Down
Loading

0 comments on commit dee5016

Please sign in to comment.