From fd3d88d98a01330babb2d1953621d46f081b960c Mon Sep 17 00:00:00 2001 From: oliver194 <100048880+oliver194@users.noreply.github.com> Date: Thu, 29 Sep 2022 12:09:51 +0100 Subject: [PATCH 1/4] add ubuntu installer --- installers/ubuntu/Dockerfile | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 installers/ubuntu/Dockerfile diff --git a/installers/ubuntu/Dockerfile b/installers/ubuntu/Dockerfile new file mode 100644 index 0000000..5bbf8fd --- /dev/null +++ b/installers/ubuntu/Dockerfile @@ -0,0 +1,35 @@ +# +# Copyright (c) 2022 oliver194 +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# + +FROM --platform=$TARGETOS/$TARGETARCH ubuntu:focal + +LABEL author="oliver194" maintainer="100048880+oliver194@users.noreply.github.com" + +LABEL org.opencontainers.image.source="https://github.com/oliver194/yolks" +LABEL org.opencontainers.image.licenses=MIT + +ENV DEBIAN_FRONTEND=noninteractive + +RUN dpkg --add-architecture i386 \ + && apt update \ + && apt upgrade -y \ + && apt -y --no-install-recommends install ca-certificates curl lib32gcc-s1 libsdl2-2.0-0:i386 git unzip zip tar jq From daf942cc8bbfaf44f84096c05936f7145b5f72ce Mon Sep 17 00:00:00 2001 From: oliver194 <100048880+oliver194@users.noreply.github.com> Date: Thu, 29 Sep 2022 12:10:54 +0100 Subject: [PATCH 2/4] Update installers.yml --- .github/workflows/installers.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 601fd4d..82a47db 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -18,6 +18,7 @@ jobs: tag: - alpine - debian + - ubuntu steps: - uses: actions/checkout@v3 - uses: docker/setup-buildx-action@v2 From b6a7cd70dc103c2693eb06893adfceba536a3371 Mon Sep 17 00:00:00 2001 From: oliver194 <100048880+oliver194@users.noreply.github.com> Date: Fri, 30 Sep 2022 08:20:02 +0100 Subject: [PATCH 3/4] Add java 19 + ubuntu installer --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 73641dc..c1f6e7e 100644 --- a/README.md +++ b/README.md @@ -126,6 +126,8 @@ is tagged correctly. * `ghcr.io/parkervcp/yolks:java_16` * [`java17`](/java/17) * `ghcr.io/parkervcp/yolks:java_17` +* [`java19`](/java/19) + * `ghcr.io/parkervcp/yolks:java_19` ### [MariaDB](/mariadb) @@ -229,3 +231,5 @@ is tagged correctly. * `ghcr.io/parkervcp/installers:alpine` * [`debian-install`](/installers/debian) * `ghcr.io/parkervcp/installers:debian` +* [`ubuntu-install`](/installers/ubuntu) + * `ghcr.io/parkervcp/installers:ubuntu` From dd3c4cfcb60fd5826219dcbf9417d59708894a5b Mon Sep 17 00:00:00 2001 From: oliver194 <100048880+oliver194@users.noreply.github.com> Date: Fri, 30 Sep 2022 17:29:51 +0100 Subject: [PATCH 4/4] fix for aarch64 --- installers/ubuntu/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/installers/ubuntu/Dockerfile b/installers/ubuntu/Dockerfile index 5bbf8fd..658af3e 100644 --- a/installers/ubuntu/Dockerfile +++ b/installers/ubuntu/Dockerfile @@ -29,7 +29,6 @@ LABEL org.opencontainers.image.licenses=MIT ENV DEBIAN_FRONTEND=noninteractive -RUN dpkg --add-architecture i386 \ - && apt update \ - && apt upgrade -y \ - && apt -y --no-install-recommends install ca-certificates curl lib32gcc-s1 libsdl2-2.0-0:i386 git unzip zip tar jq +RUN apt update \ + && apt upgrade -y \ + && apt -y --no-install-recommends install ca-certificates curl git unzip zip tar jq