Skip to content

Commit

Permalink
Merge pull request #279 from pelican-eggs/LegacyKeyValueFormat
Browse files Browse the repository at this point in the history
Update docker Legacy key value format and bump docker/build-push-action to v6
  • Loading branch information
parkervcp authored Jan 3, 2025
2 parents fb0be1a + 9b59b81 commit f758ba5
Show file tree
Hide file tree
Showing 63 changed files with 68 additions and 68 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/apps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}

- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./apps/${{ matrix.app }}
file: ./apps/${{ matrix.app }}/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./oses/${{ matrix.oses }}
file: ./oses/${{ matrix.oses }}/Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./bot/${{ matrix.tag }}
file: ./bot/${{ matrix.tag }}/Dockerfile
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
# registry: ghcr.io
# username: ${{ github.repository_owner }}
# password: ${{ secrets.REGISTRY_TOKEN }}
# - uses: docker/build-push-action@v5
# - uses: docker/build-push-action@v6
# with:
# context: ./bot/${{ matrix.tag }}
# file: ./bot/${{ matrix.tag }}/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/box64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./box64
file: ./${{ matrix.tag }}/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./bun
file: ./bun/${{ matrix.tag }}/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cassandra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./cassandra
file: ./cassandra/${{ matrix.tag }}/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./dart
file: ./dart/${{ matrix.tag }}/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./dotnet
file: ./dotnet/${{ matrix.tag }}/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/elixir.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./elixir
file: ./elixir/${{ matrix.tag }}/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/erlang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./erlang
file: ./erlang/${{ matrix.tag }}/Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/games.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./games/${{ matrix.game }}
file: ./games/${{ matrix.game }}/Dockerfile
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./games/${{ matrix.game }}
file: ./games/${{ matrix.game }}/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./go
file: ./go/${{ matrix.tag }}/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/installers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./installers
file: ./installers/${{ matrix.tag }}/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./java
file: ./java/${{ matrix.tag }}/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mariadb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./mariadb
file: ./mariadb/${{ matrix.tag }}/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mongodb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./mongodb
file: ./mongodb/${{ matrix.tag }}/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mono.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./mono
file: ./mono/${{ matrix.tag }}/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./nodejs
file: ./nodejs/${{ matrix.tag }}/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./postgres
file: ./postgres/${{ matrix.tag }}/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./python
file: ./python/${{ matrix.tag }}/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/redis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./redis
file: ./redis/${{ matrix.tag }}/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./rust
file: ./rust/${{ matrix.tag }}/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/steamcmd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./steamcmd
file: ./steamcmd/${{ matrix.distro }}/Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/voice.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./voice/${{ matrix.tag }}
file: ./voice/${{ matrix.tag }}/Dockerfile
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./voice/${{ matrix.tag }}
file: ./voice/${{ matrix.tag }}/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
- uses: docker/build-push-action@v5
- uses: docker/build-push-action@v6
with:
context: ./wine
file: ./wine/${{ matrix.tag }}/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion bot/parkertron/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM --platform=$TARGETOS/$TARGETARCH debian:bookworm

LABEL author="Michael Parker" maintainer="[email protected]"

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

RUN apt update -y \
# general packages
Expand Down
6 changes: 3 additions & 3 deletions bot/sinusbot/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim
LABEL org.opencontainers.image.authors="[email protected]"
LABEL version="1.0"

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

# Install Dependencies
RUN apt update \
Expand All @@ -14,8 +14,8 @@ RUN apt update \
&& useradd -m -d /home/container container
#RUN python3 -m pip install requests

ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
ENV LANG=C.UTF-8
ENV LC_ALL=C.UTF-8

USER container
ENV USER=container HOME=/home/container
Expand Down
2 changes: 1 addition & 1 deletion box64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim

LABEL author="QuintenQVD" maintainer="[email protected]"

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

## Update base packages
RUN apt update \
Expand Down
2 changes: 1 addition & 1 deletion dotnet/2.1/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM --platform=$TARGETOS/$TARGETARCH ghcr.io/parkervcp/yolks:debian

LABEL author="Torsten Widmann" maintainer="[email protected]"

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

RUN apt update -y \
&& apt upgrade -y \
Expand Down
2 changes: 1 addition & 1 deletion dotnet/3.1/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM --platform=$TARGETOS/$TARGETARCH ghcr.io/parkervcp/yolks:debian

LABEL author="Torsten Widmann" maintainer="[email protected]"

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

RUN apt update -y \
&& apt upgrade -y \
Expand Down
2 changes: 1 addition & 1 deletion dotnet/5/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM --platform=$TARGETOS/$TARGETARCH ghcr.io/parkervcp/yolks:debian

LABEL author="Torsten Widmann" maintainer="[email protected]"

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

RUN apt update -y \
&& apt upgrade -y \
Expand Down
2 changes: 1 addition & 1 deletion dotnet/6/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM --platform=$TARGETOS/$TARGETARCH ghcr.io/parkervcp/yolks:debian

LABEL author="Torsten Widmann" maintainer="[email protected]"

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

RUN apt update -y \
&& apt upgrade -y \
Expand Down
2 changes: 1 addition & 1 deletion dotnet/7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM --platform=$TARGETOS/$TARGETARCH ghcr.io/parkervcp/yolks:debian

LABEL author="Torsten Widmann" maintainer="[email protected]"

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

RUN apt update -y \
&& apt upgrade -y \
Expand Down
2 changes: 1 addition & 1 deletion dotnet/8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM --platform=$TARGETOS/$TARGETARCH ghcr.io/parkervcp/yolks:debian

LABEL author="Torsten Widmann" maintainer="[email protected]"

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

RUN apt update -y \
&& apt upgrade -y \
Expand Down
2 changes: 1 addition & 1 deletion dotnet/9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM --platform=$TARGETOS/$TARGETARCH ghcr.io/parkervcp/yolks:debian

LABEL author="Torsten Widmann" maintainer="[email protected]"

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

RUN apt update -y \
&& apt upgrade -y \
Expand Down
2 changes: 1 addition & 1 deletion games/altv/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FROM --platform=$TARGETOS/$TARGETARCH node:16-bookworm

LABEL author="goover" maintainer="[email protected]"

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

RUN useradd -m -d /home/container -s /bin/bash container

Expand Down
2 changes: 1 addition & 1 deletion games/minetest/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM --platform=$TARGETOS/$TARGETARCH ubuntu:22.04
ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

RUN apt update -y \
&& apt install -y curl ca-certificates openssl git tar gnupg2 sqlite3 fontconfig tzdata iproute2 libfreetype6 software-properties-common \
Expand Down
2 changes: 1 addition & 1 deletion games/mta/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM --platform=$TARGETOS/$TARGETARCH ubuntu:20.04

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

## add container user
RUN useradd -m -d /home/container -s /bin/bash container
Expand Down
2 changes: 1 addition & 1 deletion games/valheim/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM --platform=$TARGETOS/$TARGETARCH ubuntu:22.04

LABEL author="Daniel Barton" maintainer="[email protected]"

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

## add container user
RUN useradd -m -d /home/container -s /bin/bash container
Expand Down
2 changes: 1 addition & 1 deletion mariadb/10.3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FROM --platform=$TARGETOS/$TARGETARCH mariadb:10.3

LABEL author="Michael Parker" maintainer="[email protected]"

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

RUN apt update -y \
&& apt install -y netcat \
Expand Down
Loading

0 comments on commit f758ba5

Please sign in to comment.