From db068f5c6ab6ac510ee610f429365df5fcaf70c2 Mon Sep 17 00:00:00 2001 From: Ron Rise Date: Mon, 25 Aug 2025 21:23:08 -0400 Subject: [PATCH] Squash --- .gitea/workflows/build.yml | 2 ++ .gitea/workflows/tests.yml | 39 -------------------------------------- Dockerfile | 11 ++++------- go.sum | 4 ++-- main.go | 5 +++-- 5 files changed, 11 insertions(+), 50 deletions(-) delete mode 100644 .gitea/workflows/tests.yml diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 3177589..f4b86cd 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -33,6 +33,7 @@ jobs: - name: 🐳 🔨 Build Backend Container uses: docker/build-push-action@v6 with: + platforms: linux/amd64,linux/arm64 provenance: true sbom: true push: true @@ -43,6 +44,7 @@ jobs: - name: 🐳 🔨 Build Backend Container - Latest Tag uses: docker/build-push-action@v6 with: + platforms: linux/amd64,linux/arm64 provenance: true sbom: true push: true diff --git a/.gitea/workflows/tests.yml b/.gitea/workflows/tests.yml deleted file mode 100644 index bc580fc..0000000 --- a/.gitea/workflows/tests.yml +++ /dev/null @@ -1,39 +0,0 @@ -on: - push: - branches: - - "*" - -name: 🏗️✨ Test Build Workflow - -jobs: - Build: - name: 🖥️ 🔨 Build - runs-on: ubuntu-latest - steps: - - name: 🛡️ 🔒 Add Siteworx CA Certificates - run: | - apt update && apt install -yq ca-certificates curl - curl -Ls https://siteworxpro.com/hosted/Siteworx+Root+CA.pem -o /usr/local/share/ca-certificates/sw.crt - update-ca-certificates - - - name: 📖 🔍 Checkout Repository Code - uses: actions/checkout@v2 - with: - fetch-depth: 1 - - - name: 🔑 🔐 Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: 🏗️ 🔧 Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: 🐳 🔨 Build Backend Container - uses: docker/build-push-action@v6 - with: - platforms: linux/amd64 - context: . - dockerfile: Dockerfile - tags: siteworxpro/aws-iam-anywhere:${{ gitea.ref_name }} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 8e6526e..8b809af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,21 +5,18 @@ WORKDIR /app ADD . . ENV GOPRIVATE=git.siteworxpro.com -ENV CGO_ENABLED=0 -RUN go mod download && go build -o aws-iam-anywhere-refresher . +RUN go mod tidy && go build -o aws-iam-anywhere-refresher . FROM siteworxpro/alpine:3.21.4 AS runtime -RUN apt update && apt install -yq ca-certificates curl -RUN curl -Ls https://siteworxpro.com/hosted/Siteworx+Root+CA.pem -o /usr/local/share/ca-certificates/sw.crt \ - && update-ca-certificates - WORKDIR /app COPY --from=build /app/aws-iam-anywhere-refresher /app/aws-iam-anywhere-refresher -RUN useradd -b /app iam && \ +RUN apk add --no-cache gcompat + +RUN adduser -Dh /app iam && \ chown iam:iam /app/aws-iam-anywhere-refresher USER iam diff --git a/go.sum b/go.sum index 03d875b..8515085 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -git.siteworxpro.com/packages/go/utilities v1.3.0 h1:931q66COBJATgIQksPDSZlWMIwENJhhfC/GVf22ER5s= -git.siteworxpro.com/packages/go/utilities v1.3.0/go.mod h1:iWhICNrMnB03PY9dM9eCNs9uQPEsPwae5pJDG+HHUPI= +gitea.siteworxpro.com/golang-packages/utilities v1.0.0 h1:f5JqAeZWBn/HBO9k5dzg0Wm91a69uwU5UC2P9ebQ9J0= +gitea.siteworxpro.com/golang-packages/utilities v1.0.0/go.mod h1:QNqclnfv/BT2D5tbXgsGm7uhhe2Baovi5F6j0pVvMGc= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= diff --git a/main.go b/main.go index ad7ab1c..9e7ad69 100644 --- a/main.go +++ b/main.go @@ -1,13 +1,14 @@ package main import ( + "os" + "time" + helper "gitea.siteworxpro.com/Siteworxpro/aws-iam-anywhere-refresher/aws_signing_helper" "gitea.siteworxpro.com/Siteworxpro/aws-iam-anywhere-refresher/cmd" appConfig "gitea.siteworxpro.com/Siteworxpro/aws-iam-anywhere-refresher/config" "gitea.siteworxpro.com/Siteworxpro/aws-iam-anywhere-refresher/kube_client" "github.com/charmbracelet/log" - "os" - "time" ) func main() {