Merge branch 'main' of https://github.com/sparkedhost/images

Author: griffindor301

.github/workflows/golang-121.yml .github/workflows/golang.yml.github/workflows/golang-121.yml renamed to .github/workflows/golang.yml

@@ -1,33 +1,41 @@
-name: Build golang-121
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-    paths:
-      - golang/golang-121/*
-      - golang/entrypoint.sh
-      - .github/workflows/golang-121.yml
-jobs:
-  push:
-    name: "golang-121"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: docker/setup-buildx-action@v2
-        with:
-          version: "v0.9.1"
-          buildkitd-flags: --debug
-      - uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - uses: docker/build-push-action@v3
-        with:
-          context: ./golang
-          file: ./golang/golang-121/Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: |
-            ghcr.io/sparkedhost/images:golang-121
+name: Build Go Images
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths:
+      - "golang/**"
+      - ".github/workflows/golang.yml"
+
+jobs:
+  build:
+    name: "Go ${{ matrix.version }}"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - 121
+          - 124
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: docker/setup-buildx-action@v2
+        with:
+          version: "v0.9.1"
+          buildkitd-flags: --debug
+      - uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - uses: docker/build-push-action@v3
+        with:
+          context: ./golang
+          file: ./golang/golang-${{ matrix.version }}/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: |
+            ghcr.io/sparkedhost/images:golang-${{ matrix.version }}

golang/golang-121/Dockerfile

@@ -7,6 +7,10 @@ FROM golang:1.21
 
 LABEL       author="DevOps Team at Sparked Host" maintainer="devops@sparkedhost.com"
 
+RUN apt-get update -y \
+ && apt-get install fontconfig iproute2 curl ca-certificates unzip tar jq -y \
+ && useradd -d /home/container -m container
+
 USER container
 ENV  USER=container HOME=/home/container LANG=C.UTF-8
 

golang/golang-124/Dockerfile

@@ -0,0 +1,21 @@
+# ----------------------------------
+# Sparked Host Custom Docker Image
+# Image: ghcr.io/sparkedhost/images:golang-124
+# ----------------------------------
+
+FROM golang:1.24
+
+LABEL       author="DevOps Team at Sparked Host" maintainer="devops@sparkedhost.com"
+
+RUN apt-get update -y \
+ && apt-get install fontconfig iproute2 curl ca-certificates unzip tar jq -y \
+ && useradd -d /home/container -m container
+
+USER container
+ENV  USER=container HOME=/home/container LANG=C.UTF-8
+
+WORKDIR     /home/container
+
+COPY        ./entrypoint.sh /entrypoint.sh
+
+CMD         ["/bin/bash", "/entrypoint.sh"]