From 7c0061618fa4a50909c1d79205a708c1b4892e82 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 22 Aug 2021 19:45:45 +0200 Subject: [PATCH 1/8] Updated package, for Bullseye (#7) --- installers/debian/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installers/debian/Dockerfile b/installers/debian/Dockerfile index 8c0fb25..6c3568c 100644 --- a/installers/debian/Dockerfile +++ b/installers/debian/Dockerfile @@ -32,4 +32,4 @@ ENV DEBIAN_FRONTEND=noninteractive RUN dpkg --add-architecture i386 \ && apt update \ && apt upgrade -y \ - && apt -y --no-install-recommends install ca-certificates curl lib32gcc1 libsdl2-2.0-0:i386 git + && apt -y --no-install-recommends install ca-certificates curl lib32gcc-s1 libsdl2-2.0-0:i386 git From 581038a328342b749be3655ecc32f1a6e4f5f122 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 22 Aug 2021 19:46:05 +0200 Subject: [PATCH 2/8] Fix for Debian Bullyeye (#8) --- games/source/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games/source/Dockerfile b/games/source/Dockerfile index 446ebe9..8ce953a 100644 --- a/games/source/Dockerfile +++ b/games/source/Dockerfile @@ -32,7 +32,7 @@ ENV DEBIAN_FRONTEND=noninteractive RUN dpkg --add-architecture i386 \ && apt update \ && apt upgrade -y \ - && apt install -y tar curl gcc g++ lib32gcc1 libgcc1 libcurl4-gnutls-dev:i386 libssl1.1:i386 libcurl4:i386 lib32tinfo6 libtinfo6:i386 lib32z1 lib32stdc++6 libncurses5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 iproute2 gdb libsdl1.2debian libfontconfig telnet net-tools netcat tzdata \ + && apt install -y tar curl gcc g++ lib32gcc-s1 libgcc1 libcurl4-gnutls-dev:i386 libssl1.1:i386 libcurl4:i386 lib32tinfo6 libtinfo6:i386 lib32z1 lib32stdc++6 libncurses5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 iproute2 gdb libsdl1.2debian libfontconfig1 telnet net-tools netcat tzdata \ && useradd -m -d /home/container container USER container From 61e341587eb9e0f08df3bc594471dce28a34d795 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Tue, 24 Aug 2021 19:10:35 +0200 Subject: [PATCH 3/8] Add Dotnet 2.1, 3.1, 5.0 Docker Images (#9) * Add Dotnet 2.1, 3.2, 5.0 Docker Images --- .github/workflows/dotnet.yml | 41 ++++++++++++++++++++++++++++++++++++ README.md | 7 ++++++ dotnet/2.1/Dockerfile | 21 ++++++++++++++++++ dotnet/3.1/Dockerfile | 21 ++++++++++++++++++ dotnet/5/Dockerfile | 21 ++++++++++++++++++ dotnet/entrypoint.sh | 12 +++++++++++ 6 files changed, 123 insertions(+) create mode 100644 .github/workflows/dotnet.yml create mode 100644 dotnet/2.1/Dockerfile create mode 100644 dotnet/3.1/Dockerfile create mode 100644 dotnet/5/Dockerfile create mode 100644 dotnet/entrypoint.sh diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml new file mode 100644 index 0000000..8def61e --- /dev/null +++ b/.github/workflows/dotnet.yml @@ -0,0 +1,41 @@ +name: build dotnet +on: + # Allows you to run this workflow manually from the Actions tab + # workflow_dispatch: + schedule: + - cron: "0 0 * * 1" + push: + branches: + - master + paths: + - dotnet/** +jobs: + push: + name: "yolks:dotnet_${{ matrix.tag }}" + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + tag: + - 2.1 + - 3.1 + - 5.0 + steps: + - uses: actions/checkout@v2 + - uses: docker/setup-buildx-action@v1 + with: + version: "v0.5.1" + buildkitd-flags: --debug + - uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.REGISTRY_TOKEN }} + - uses: docker/build-push-action@v2 + with: + context: ./dotnet + file: ./dotnet/${{ matrix.tag }}/Dockerfile + platforms: linux/amd64 + push: true + tags: | + ghcr.io/parkervcp/yolks:dotnet_${{ matrix.tag }} diff --git a/README.md b/README.md index a196a6b..2ac804b 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,13 @@ is tagged correctly. * `ghcr.io/parkervcp/yolks:cassandra_java11_python2` * [`cassandra_java11_python3`](/cassandra/cassandra_java11_python3) * `ghcr.io/parkervcp/yolks:cassandra_java11_python3` +### [dotNet](/dotnet) + * [`dotnet2.1`](/dotnet/2.1) + * `ghcr.io/parkervcp/yolks:dotnet_2.1` + * [`dotnet3.1`](/dotnet/3.1) + * `ghcr.io/parkervcp/yolks:dotnet_3.1` + * [`dotnet5.0`](/dotnet/5.0) + * `ghcr.io/parkervcp/yolks:dotnet_5.0` ### [Erlang](/erlang) * [`erlang22`](/erlang/22) * `ghcr.io/parkervcp/yolks:erlang_22` diff --git a/dotnet/2.1/Dockerfile b/dotnet/2.1/Dockerfile new file mode 100644 index 0000000..eac865a --- /dev/null +++ b/dotnet/2.1/Dockerfile @@ -0,0 +1,21 @@ +FROM ghcr.io/parkervcp/yolks:debian + +LABEL author="Torsten Widmann" maintainer="info@goover.de" + +ENV DEBIAN_FRONTEND noninteractive + +RUN apt update -y \ + && apt upgrade -y \ + && apt install -y apt-transport-https wget iproute2 \ + && wget https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ + && dpkg -i packages-microsoft-prod.deb \ + && rm packages-microsoft-prod.deb \ + && apt update -y \ + && apt install -y aspnetcore-runtime-2.1 libgdiplus + +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container + +COPY ./../entrypoint.sh /entrypoint.sh +CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/dotnet/3.1/Dockerfile b/dotnet/3.1/Dockerfile new file mode 100644 index 0000000..d6017e9 --- /dev/null +++ b/dotnet/3.1/Dockerfile @@ -0,0 +1,21 @@ +FROM ghcr.io/parkervcp/yolks:debian + +LABEL author="Torsten Widmann" maintainer="info@goover.de" + +ENV DEBIAN_FRONTEND noninteractive + +RUN apt update -y \ + && apt upgrade -y \ + && apt install -y apt-transport-https wget iproute2 \ + && wget https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ + && dpkg -i packages-microsoft-prod.deb \ + && rm packages-microsoft-prod.deb \ + && apt update -y \ + && apt install -y aspnetcore-runtime-3.1 libgdiplus + +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container + +COPY ./../entrypoint.sh /entrypoint.sh +CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/dotnet/5/Dockerfile b/dotnet/5/Dockerfile new file mode 100644 index 0000000..afcf253 --- /dev/null +++ b/dotnet/5/Dockerfile @@ -0,0 +1,21 @@ +FROM ghcr.io/parkervcp/yolks:debian + +LABEL author="Torsten Widmann" maintainer="info@goover.de" + +ENV DEBIAN_FRONTEND noninteractive + +RUN apt update -y \ + && apt upgrade -y \ + && apt install -y apt-transport-https wget iproute2 \ + && wget https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ + && dpkg -i packages-microsoft-prod.deb \ + && rm packages-microsoft-prod.deb \ + && apt update -y \ + && apt install -y aspnetcore-runtime-5.0 libgdiplus + +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container + +COPY ./../entrypoint.sh /entrypoint.sh +CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/dotnet/entrypoint.sh b/dotnet/entrypoint.sh new file mode 100644 index 0000000..13d9e20 --- /dev/null +++ b/dotnet/entrypoint.sh @@ -0,0 +1,12 @@ +#!/bin/bash +cd /home/container + +# Make internal Docker IP address available to processes. +export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` + +# Replace Startup Variables +MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') +echo -e ":/home/container$ ${MODIFIED_STARTUP}" + +# Run the Server +eval ${MODIFIED_STARTUP} From 75af71a122643211a68559446f78f36901f46b14 Mon Sep 17 00:00:00 2001 From: Softwarenoob Date: Tue, 24 Aug 2021 20:50:37 +0300 Subject: [PATCH 4/8] ci(base): Correct package path --- .github/workflows/base.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml index b1d79b5..603be73 100644 --- a/.github/workflows/base.yml +++ b/.github/workflows/base.yml @@ -9,7 +9,7 @@ on: - oses/** jobs: push: - name: "yolks_os:${{ matrix.oses }}" + name: "yolks:${{ matrix.oses }}" runs-on: ubuntu-latest strategy: fail-fast: false @@ -36,4 +36,4 @@ jobs: platforms: linux/amd64 push: true tags: | - ghcr.io/parkervcp/yolks_os:${{ matrix.oses }} + ghcr.io/parkervcp/yolks:${{ matrix.oses }} From 7ef5084968fe9fab05e0c737c70eb76e4e92a4f5 Mon Sep 17 00:00:00 2001 From: Softwarenoob Date: Tue, 24 Aug 2021 20:54:27 +0300 Subject: [PATCH 5/8] ci(build): force rebuild base images --- oses/debian/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oses/debian/entrypoint.sh b/oses/debian/entrypoint.sh index d9f5b44..9a5cab5 100644 --- a/oses/debian/entrypoint.sh +++ b/oses/debian/entrypoint.sh @@ -1,7 +1,7 @@ #!/bin/bash cd /home/container -# Make internal Docker IP address available to processes. +# Make internal Docker IP address available to processes. export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` # Replace Startup Variables From 7bbb93110cdcbd6b63ee3803e30cfb21e2eedb0a Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 24 Aug 2021 21:05:46 +0300 Subject: [PATCH 6/8] ci(dotnet): fix workflow and formatting Fix formatting and provide build platform. This together with debian path fix should resolve building of the images --- dotnet/2.1/Dockerfile | 32 ++++++++++++++++---------------- dotnet/3.1/Dockerfile | 32 ++++++++++++++++---------------- dotnet/5/Dockerfile | 32 ++++++++++++++++---------------- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/dotnet/2.1/Dockerfile b/dotnet/2.1/Dockerfile index eac865a..f5167b6 100644 --- a/dotnet/2.1/Dockerfile +++ b/dotnet/2.1/Dockerfile @@ -1,21 +1,21 @@ -FROM ghcr.io/parkervcp/yolks:debian +FROM --platform=$BUILDPLATFORM ghcr.io/parkervcp/yolks:debian -LABEL author="Torsten Widmann" maintainer="info@goover.de" +LABEL author="Torsten Widmann" maintainer="info@goover.de" -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND noninteractive -RUN apt update -y \ - && apt upgrade -y \ - && apt install -y apt-transport-https wget iproute2 \ - && wget https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ - && dpkg -i packages-microsoft-prod.deb \ - && rm packages-microsoft-prod.deb \ - && apt update -y \ - && apt install -y aspnetcore-runtime-2.1 libgdiplus +RUN apt update -y \ + && apt upgrade -y \ + && apt install -y apt-transport-https wget iproute2 \ + && wget https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ + && dpkg -i packages-microsoft-prod.deb \ + && rm packages-microsoft-prod.deb \ + && apt update -y \ + && apt install -y aspnetcore-runtime-2.1 libgdiplus -USER container -ENV USER=container HOME=/home/container -WORKDIR /home/container +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container -COPY ./../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +COPY ./../entrypoint.sh /entrypoint.sh +CMD [ "/bin/bash", "/entrypoint.sh" ] diff --git a/dotnet/3.1/Dockerfile b/dotnet/3.1/Dockerfile index d6017e9..b63d1a1 100644 --- a/dotnet/3.1/Dockerfile +++ b/dotnet/3.1/Dockerfile @@ -1,21 +1,21 @@ -FROM ghcr.io/parkervcp/yolks:debian +FROM --platform=$BUILDPLATFORM ghcr.io/parkervcp/yolks:debian -LABEL author="Torsten Widmann" maintainer="info@goover.de" +LABEL author="Torsten Widmann" maintainer="info@goover.de" -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND noninteractive -RUN apt update -y \ - && apt upgrade -y \ - && apt install -y apt-transport-https wget iproute2 \ - && wget https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ - && dpkg -i packages-microsoft-prod.deb \ - && rm packages-microsoft-prod.deb \ - && apt update -y \ - && apt install -y aspnetcore-runtime-3.1 libgdiplus +RUN apt update -y \ + && apt upgrade -y \ + && apt install -y apt-transport-https wget iproute2 \ + && wget https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ + && dpkg -i packages-microsoft-prod.deb \ + && rm packages-microsoft-prod.deb \ + && apt update -y \ + && apt install -y aspnetcore-runtime-3.1 libgdiplus -USER container -ENV USER=container HOME=/home/container -WORKDIR /home/container +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container -COPY ./../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +COPY ./../entrypoint.sh /entrypoint.sh +CMD [ "/bin/bash", "/entrypoint.sh" ] diff --git a/dotnet/5/Dockerfile b/dotnet/5/Dockerfile index afcf253..7a3d14b 100644 --- a/dotnet/5/Dockerfile +++ b/dotnet/5/Dockerfile @@ -1,21 +1,21 @@ -FROM ghcr.io/parkervcp/yolks:debian +FROM --platform=$BUILDPLATFORM ghcr.io/parkervcp/yolks:debian -LABEL author="Torsten Widmann" maintainer="info@goover.de" +LABEL author="Torsten Widmann" maintainer="info@goover.de" -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND noninteractive -RUN apt update -y \ - && apt upgrade -y \ - && apt install -y apt-transport-https wget iproute2 \ - && wget https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ - && dpkg -i packages-microsoft-prod.deb \ - && rm packages-microsoft-prod.deb \ - && apt update -y \ - && apt install -y aspnetcore-runtime-5.0 libgdiplus +RUN apt update -y \ + && apt upgrade -y \ + && apt install -y apt-transport-https wget iproute2 \ + && wget https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ + && dpkg -i packages-microsoft-prod.deb \ + && rm packages-microsoft-prod.deb \ + && apt update -y \ + && apt install -y aspnetcore-runtime-5.0 libgdiplus -USER container -ENV USER=container HOME=/home/container -WORKDIR /home/container +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container -COPY ./../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +COPY ./../entrypoint.sh /entrypoint.sh +CMD [ "/bin/bash", "/entrypoint.sh" ] From 6b4870906b3b3c420e2828d09e709953b042c175 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 24 Aug 2021 21:07:56 +0300 Subject: [PATCH 7/8] refactor(dotnet): folder name --- dotnet/{5 => 5.0}/Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dotnet/{5 => 5.0}/Dockerfile (100%) diff --git a/dotnet/5/Dockerfile b/dotnet/5.0/Dockerfile similarity index 100% rename from dotnet/5/Dockerfile rename to dotnet/5.0/Dockerfile From 4f63fec3f0b7cd80d6ab7c97ed7a692c6991b48a Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 24 Aug 2021 21:07:56 +0300 Subject: [PATCH 8/8] Revert "refactor(dotnet): folder name" This reverts commit 6b4870906b3b3c420e2828d09e709953b042c175. --- dotnet/{5.0 => 5}/Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dotnet/{5.0 => 5}/Dockerfile (100%) diff --git a/dotnet/5.0/Dockerfile b/dotnet/5/Dockerfile similarity index 100% rename from dotnet/5.0/Dockerfile rename to dotnet/5/Dockerfile