Merge pull request #203 from parkervcp/fixes

Fixes images build + update workflow actions
This commit is contained in:
Michael (Parker) Parker
2023-11-19 12:36:17 -05:00
committed by GitHub
29 changed files with 129 additions and 148 deletions

View File

@@ -18,7 +18,7 @@ jobs:
app:
- uptimekuma
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: docker/setup-qemu-action@v3

View File

@@ -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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./oses/${{ matrix.oses }}
file: ./oses/${{ matrix.oses }}/Dockerfile

View File

@@ -21,12 +21,12 @@ jobs:
- sinusbot
- bastion
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
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
with:
platforms: arm64,amd64
- name: Cache Docker layers
@@ -36,12 +36,12 @@ jobs:
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
- uses: docker/login-action@v2
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./bot/${{ matrix.tag }}
file: ./bot/${{ matrix.tag }}/Dockerfile
@@ -75,7 +75,7 @@ jobs:
# registry: ghcr.io
# username: ${{ github.repository_owner }}
# password: ${{ secrets.REGISTRY_TOKEN }}
# - uses: docker/build-push-action@v2
# - uses: docker/build-push-action@v5
# with:
# context: ./bot/${{ matrix.tag }}
# file: ./bot/${{ matrix.tag }}/Dockerfile

View File

@@ -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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./box64
file: ./${{ matrix.tag }}/Dockerfile

View File

@@ -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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./bun
file: ./bun/${{ matrix.tag }}/Dockerfile

View File

@@ -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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./cassandra
file: ./cassandra/${{ matrix.tag }}/Dockerfile

View File

@@ -20,18 +20,18 @@ jobs:
- 2.18
- 2.19
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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./dart
file: ./dart/${{ matrix.tag }}/Dockerfile

View File

@@ -23,18 +23,18 @@ jobs:
- 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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./dotnet
file: ./dotnet/${{ matrix.tag }}/Dockerfile

View File

@@ -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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./elixir
file: ./elixir/${{ matrix.tag }}/Dockerfile

View File

@@ -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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./erlang
file: ./erlang/${{ matrix.tag }}/Dockerfile

View File

@@ -25,16 +25,16 @@ jobs:
- valheim
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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./games/${{ matrix.game }}
file: ./games/${{ matrix.game }}/Dockerfile
@@ -52,20 +52,20 @@ jobs:
- minetest
- mta
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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./games/${{ matrix.game }}
file: ./games/${{ matrix.game }}/Dockerfile

View File

@@ -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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./go
file: ./go/${{ matrix.tag }}/Dockerfile

View File

@@ -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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./installers
file: ./installers/${{ matrix.tag }}/Dockerfile

View File

@@ -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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./java
file: ./java/${{ matrix.tag }}/Dockerfile

View File

@@ -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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./mariadb
file: ./mariadb/${{ matrix.tag }}/Dockerfile

View File

@@ -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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./mongodb
file: ./mongodb/${{ matrix.tag }}/Dockerfile

View File

@@ -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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./mono
file: ./mono/${{ matrix.tag }}/Dockerfile

View File

@@ -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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./nodejs
file: ./nodejs/${{ matrix.tag }}/Dockerfile

View File

@@ -24,17 +24,17 @@ jobs:
- 13
- 14
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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./postgres
file: ./postgres/${{ matrix.tag }}/Dockerfile

View File

@@ -24,18 +24,18 @@ jobs:
- '3.11'
- '3.12'
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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./python
file: ./python/${{ matrix.tag }}/Dockerfile

View File

@@ -21,17 +21,17 @@ jobs:
- 6
- 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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./redis
file: ./redis/${{ matrix.tag }}/Dockerfile

View File

@@ -16,23 +16,22 @@ jobs:
fail-fast: false
matrix:
tag:
- '1.31'
- '1.56'
- '1.60'
- 'latest'
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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./rust
file: ./rust/${{ matrix.tag }}/Dockerfile

View File

@@ -21,16 +21,16 @@ jobs:
- dotnet
- proton
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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./steamcmd
file: ./steamcmd/${{ matrix.distro }}/Dockerfile

View File

@@ -18,16 +18,16 @@ jobs:
tag:
- teaspeak
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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./voice/${{ matrix.tag }}
file: ./voice/${{ matrix.tag }}/Dockerfile
@@ -45,19 +45,19 @@ jobs:
tag:
- mumble
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:
version: "v0.8.2"
buildkitd-flags: --debug
- uses: docker/login-action@v2
- uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v3
- uses: docker/build-push-action@v5
with:
context: ./voice/${{ matrix.tag }}
file: ./voice/${{ matrix.tag }}/Dockerfile

View File

@@ -20,16 +20,16 @@ jobs:
- devel
- staging
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.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v5
with:
context: ./wine
file: ./wine/${{ matrix.tag }}/Dockerfile

View File

@@ -251,8 +251,6 @@ is tagged correctly.
### [Rust](/rust)
* ['rust1.31'](/rust/1.31)
* `ghcr.io/parkervcp/yolks:rust_1.31`
* ['rust1.56'](/rust/1.56)
* `ghcr.io/parkervcp/yolks:rust_1.56`
* ['rust1.60'](/rust/1.60)

View File

@@ -4,8 +4,10 @@ LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
## install nodejs 18
RUN apt update && apt install --no-install-recommends -y curl \
&& curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \
&& apt install -y nodejs \
&& mkdir -p /etc/apt/keyrings \
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
&& apt update && apt install -y nodejs \
&& npm install -g npm@latest \
## install bastion reqs
&& apt install -y python3 build-essential git libtool netcat ffmpeg iproute2 tzdata tini \

View File

@@ -37,7 +37,7 @@ RUN apt update \
tini
RUN pip install --upgrade pip
RUN pip install python-forecastio tweepy unidecode discord-text-sanitizer mcstatus bs4 sqlalchemy geocoder valve python-valve py-cpuinfo psutil
RUN pip install python-forecastio tweepy unidecode mcstatus bs4 sqlalchemy geocoder valve python-valve py-cpuinfo psutil
RUN mkdir -p /home/container/.config/Red-DiscordBot/
RUN ln -s /home/container/.config/Red-DiscordBot/ /usr/local/share/Red-DiscordBot

View File

@@ -1,18 +0,0 @@
FROM --platform=$TARGETOS/$TARGETARCH rust:1.31-slim
LABEL author="Ethan Coward" maintainer="ethan.coward@icloud.com"
RUN apt update \
&& apt -y install git dnsutils curl iproute2 ffmpeg tini \
&& useradd -m -d /home/container container
USER container
ENV USER=container HOME=/home/container CARGO_HOME=/home/container/.cargo
WORKDIR /home/container
STOPSIGNAL SIGINT
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]