more stuff

Author: CodeMeAPixel

.gitattributes

@@ -0,0 +1 @@
+* text eol=lf

.github/workflows/bun.yml

@@ -25,9 +25,8 @@ jobs:
     strategy:
       matrix:
         tag:
-          - "1.0"
-          - "1.1"
           - "latest"
+          - "canary"
 
     steps:
       - name: Checkout repository
@@ -47,7 +46,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/buildx-action@v6
+        uses: docker/build-push-action@v6
         with:
           context: ./bun/${{ matrix.tag }}
           platforms: linux/amd64,linux/arm64

.github/workflows/games.yml

@@ -36,6 +36,7 @@ jobs:
           - rockstar/fivem
           - rockstar/redm
           - rust
+          - hytale
 
     steps:
       - name: Checkout code

.github/workflows/installers.yml

@@ -19,12 +19,24 @@ jobs:
       matrix:
         tag:
           - alpine
+
+  pushJavaInstallers:
+    name: "Build Java installers: ${{ matrix.tag }}"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        tag:
+          - java_8
+          - java_11
+          - java_17
+          - java_21
+          - java_25
+          - java_26
     steps:
       - uses: actions/checkout@v4
 
-      - uses: docker/setup-buildx-action@v6
-        with:
-          buildkitd-flags: --debug
+      - uses: docker/setup-buildx-action@v3
 
       - name: Setup QEMU for multiarch builds
         uses: docker/setup-qemu-action@v3
@@ -58,12 +70,11 @@ jobs:
       matrix:
         tag:
           - debian
+          - ubuntu
     steps:
       - uses: actions/checkout@v4
 
-      - uses: docker/setup-buildx-action@v6
-        with:
-          buildkitd-flags: --debug
+      - uses: docker/setup-buildx-action@v3
 
       - uses: docker/login-action@v3
         with:

.github/workflows/java.yml

@@ -18,7 +18,16 @@ jobs:
       fail-fast: false
       matrix:
         tag:
-          - 25
+          - "11j9"
+          - "11"
+          - "16j9"
+          - "16"
+          - "17"
+          - "19"
+          - "21"
+          - "22"
+          - "25"
+          - "26"
     steps:
       - uses: actions/checkout@v4
 
@@ -27,9 +36,7 @@ jobs:
           platforms: amd64,arm64
           image: tonistiigi/binfmt:qemu-v7.0.0-28
 
-      - uses: docker/setup-buildx-action@v6
-        with:
-          buildkitd-flags: --debug
+      - uses: docker/setup-buildx-action@v3
 
       - uses: docker/login-action@v3
         with:

.github/workflows/oses.yml

@@ -28,9 +28,7 @@ jobs:
           platforms: amd64,arm64
           image: tonistiigi/binfmt:qemu-v7.0.0-28
 
-      - uses: docker/setup-buildx-action@v6
-        with:
-          buildkitd-flags: --debug
+      - uses: docker/setup-buildx-action@v3
 
       - uses: docker/login-action@v3
         with:
@@ -49,3 +47,42 @@ jobs:
           tags: |
             ghcr.io/nodebytehosting/oses:${{ matrix.oses }}
             ghcr.io/nodebytehosting/oses:${{ matrix.oses }}-latest
+
+  pushUbuntu:
+    name: "Build oses ubuntu: ${{ matrix.version }}"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - "22.04"
+          - "24.04"
+          - "25.10"
+          - "26.04"
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
+          image: tonistiigi/binfmt:qemu-v7.0.0-28
+
+      - uses: docker/setup-buildx-action@v3
+
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: docker/build-push-action@v6
+        with:
+          context: ./oses/ubuntu/${{ matrix.version }}
+          file: ./oses/ubuntu/${{ matrix.version }}/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          tags: |
+            ghcr.io/nodebytehosting/oses:ubuntu_${{ matrix.version }}
+            ghcr.io/nodebytehosting/oses:ubuntu_${{ matrix.version }}-latest

README.md

@@ -16,11 +16,13 @@ All images are automatically built and published to [GitHub Container Registry](
 ```
 game-recipes/
   games/          - Game server recipes
+  oses/           - OS base images (Alpine, Debian, Ubuntu)
+  installers/     - Temporary installer images
   golang/         - Go runtime (1.14+)
-  nodejs/         - Node.js runtime (versions 12-20)
-  bun/            - Bun runtime (versions 1.0+)
+  nodejs/         - Node.js runtime (20, 22 LTS only)
+  bun/            - Bun runtime (1.0, 1.1, latest, canary)
   python/         - Python runtime (3.7-3.11)
-  java/           - Java runtime (v25+)
+  java/           - Java runtime (8, 11, 16, 17, 19, 21, 22, 25, 26)
 ```
 
 ## Available Recipes
@@ -32,16 +34,25 @@ game-recipes/
 | FiveM (GTA V) | `ghcr.io/nodebytehosting/games:fivem` | Production |
 | RedM (RDR 2) | `ghcr.io/nodebytehosting/games:redm` | Coming soon |
 | Minecraft | `ghcr.io/nodebytehosting/games:minecraft` | Beta |
+| Rust | `ghcr.io/nodebytehosting/games:rust` | Production |
+| Hytale | `ghcr.io/nodebytehosting/games:hytale` | Production |
 
 ### Runtimes
 
 | Runtime | Versions | Image Format |
 |---------|----------|--------------|
 | Go | 1.14+ | `ghcr.io/nodebytehosting/golang:golang_{version}` |
 | Node.js | 20, 22 (LTS only) | `ghcr.io/nodebytehosting/nodejs:nodejs_{version}` |
-| Bun | 1.0, 1.1, latest | `ghcr.io/nodebytehosting/bun:bun_{version}` |
+| Bun | 1.0, 1.1, latest, canary | `ghcr.io/nodebytehosting/bun:bun_{version}` |
 | Python | 3.7, 3.8, 3.9, 3.10, 3.11 | `ghcr.io/nodebytehosting/python:python_{version}` |
-| Java | 25+ | `ghcr.io/nodebytehosting/java:java_{version}` |
+| Java | 8, 8j9, 11, 11j9, 16, 16j9, 17, 19, 21, 22, 25, 26 | `ghcr.io/nodebytehosting/java:java_{version}` |
+
+### Operating Systems & Installers
+
+| Type | Variants | Image Format | Use Case |
+|------|----------|--------------|----------|
+| OS Images | Alpine 3.20, Debian Bookworm, Ubuntu 22.04-26.04 | `ghcr.io/nodebytehosting/oses:{name}` | Base container images |
+| Installers | Alpine, Debian, Ubuntu, Java (8, 11, 17, 21, 25, 26) | `ghcr.io/nodebytehosting/installers:{name}` | Temporary deployment images |
 
 ## Features
 

bun/1.0/Dockerfile bun/canary/Dockerfilebun/1.0/Dockerfile renamed to bun/canary/Dockerfile

@@ -20,14 +20,14 @@
 # SOFTWARE.
 #
 
-FROM        --platform=$TARGETOS/$TARGETARCH oven/bun:1.0-alpine
+FROM        --platform=$TARGETOS/$TARGETARCH oven/bun:canary
 
 LABEL       author="Tyler Hodgkin" maintainer="tyler.h@nodebyte.co.uk"
 
 LABEL       org.opencontainers.image.source="https://github.com/nodebytehosting/recipes"
-LABEL       org.opencontainers.image.description="Bun 1.0 runtime for containerized applications"
+LABEL       org.opencontainers.image.description="Bun latest runtime for containerized applications"
 LABEL       org.opencontainers.image.licenses=MIT
-LABEL       org.opencontainers.image.version="1.0"
+LABEL       org.opencontainers.image.version="latest"
 
 RUN         apk add --update --no-cache \
               ca-certificates \