chore: Add Docker Compose files and remove unused files

.dockerignore

@@ -1,18 +1,16 @@
 plural/
 .gitlab-ci.yml
-Pluralfile
-plural.lock
 .gitignore
 .github/
 .goreleaser.yaml
 .golangci.yml
 .DS_Store
-docker-compose.yml
 *.md
 renovate.json
 packer/
 hack/
 Makefile
 Dockerfile
-dockerfiles
-!dockerfiles/dind-config
+test.Dockerfile
+docker-compose.yml
+docker-compose.test.yml

.github/workflows/ci.yaml

@@ -169,140 +169,6 @@ jobs:
         with:
           sarif_file: 'trivy-results.sarif'
 
-  # cloud:
-  #   name: Build cloud image
-  #   runs-on: ubuntu-latest
-  #   permissions:
-  #     contents: 'read'
-  #     id-token: 'write'
-  #     packages: 'write'
-  #     security-events: write
-  #     actions: read
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-  #     - name: Docker meta
-  #       id: meta
-  #       uses: docker/metadata-action@v4
-  #       with:
-  #         # list of Docker images to use as base name for tags
-  #         images: |
-  #           ghcr.io/pluralsh/plural-cli-cloud
-  #         # generate Docker tags based on the following events/attributes
-  #         tags: |
-  #           type=sha
-  #           type=ref,event=pr
-  #           type=ref,event=branch
-  #     - name: Set up QEMU
-  #       uses: docker/setup-qemu-action@v3
-  #     - name: Set up Docker Buildx
-  #       uses: docker/setup-buildx-action@v3
-  #     - name: Login to GHCR
-  #       uses: docker/login-action@v2
-  #       with:
-  #         registry: ghcr.io
-  #         username: ${{ github.repository_owner }}
-  #         password: ${{ secrets.GITHUB_TOKEN }}
-  #     - name: Get current date
-  #       id: date
-  #       run: echo "date=$(date -u +'%Y-%m-%dT%H:%M:%S%z')" >> $GITHUB_OUTPUT
-  #     - uses: docker/build-push-action@v6
-  #       with:
-  #         context: .
-  #         file: ./dockerfiles/Dockerfile.cloud
-  #         push: true
-  #         tags: ${{ steps.meta.outputs.tags }}
-  #         labels: ${{ steps.meta.outputs.labels }}
-  #         platforms: linux/amd64,linux/arm64
-  #         # cache-from: type=gha
-  #         # cache-to: type=gha,mode=max
-  #         build-args: |
-  #           APP_VSN=dev
-  #           APP_COMMIT=${{ github.sha }}
-  #           APP_DATE=${{ steps.date.outputs.date }}
-  #     - name: Run Trivy vulnerability scanner on cli cloud image
-  #       uses: aquasecurity/trivy-action@master
-  #       with:
-  #         scan-type: 'image'
-  #         image-ref: ${{ fromJSON(steps.meta.outputs.json).tags[0] }}
-  #         hide-progress: false
-  #         format: 'sarif'
-  #         output: 'trivy-results.sarif'
-  #         scanners: 'vuln'
-  #         timeout: 10m
-  #         ignore-unfixed: true
-  #          #severity: 'CRITICAL,HIGH'
-  #     - name: Upload Trivy scan results to GitHub Security tab
-  #       uses: github/codeql-action/upload-sarif@v2
-  #       with:
-  #         sarif_file: 'trivy-results.sarif'
-#  dind:
-#    name: Build dind image
-#    runs-on: ubuntu-latest
-#    permissions:
-#      contents: 'read'
-#      id-token: 'write'
-#      packages: 'write'
-#      security-events: write
-#      actions: read
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v4
-#      - name: Docker meta
-#        id: meta
-#        uses: docker/metadata-action@v4
-#        with:
-#          # list of Docker images to use as base name for tags
-#          images: |
-#            ghcr.io/pluralsh/plural-dind
-#          # generate Docker tags based on the following events/attributes
-#          tags: |
-#            type=sha
-#            type=ref,event=pr
-#            type=ref,event=branch
-#      - name: Set up QEMU
-#        uses: docker/setup-qemu-action@v3
-#      - name: Set up Docker Buildx
-#        uses: docker/setup-buildx-action@v3
-#      - name: Login to GHCR
-#        uses: docker/login-action@v2
-#        with:
-#          registry: ghcr.io
-#          username: ${{ github.repository_owner }}
-#          password: ${{ secrets.GITHUB_TOKEN }}
-#      - name: Get current date
-#        id: date
-#        run: echo "date=$(date -u +'%Y-%m-%dT%H:%M:%S%z')" >> $GITHUB_OUTPUT
-#      - uses: docker/build-push-action@v6
-#        with:
-#          context: .
-#          file: ./dockerfiles/Dockerfile.dind
-#          push: true
-#          tags: ${{ steps.meta.outputs.tags }}
-#          labels: ${{ steps.meta.outputs.labels }}
-#          platforms: linux/amd64,linux/arm64
-#          # cache-from: type=gha
-#          # cache-to: type=gha,mode=max
-#          build-args: |
-#            APP_VSN=dev
-#            APP_COMMIT=${{ github.sha }}
-#            APP_DATE=${{ steps.date.outputs.date }}
-#      - name: Run Trivy vulnerability scanner on dind image
-#        uses: aquasecurity/trivy-action@master
-#        with:
-#          scan-type: 'image'
-#          image-ref: ${{ fromJSON(steps.meta.outputs.json).tags[0] }}
-#          hide-progress: false
-#          format: 'sarif'
-#          output: 'trivy-results.sarif'
-#          scanners: 'vuln'
-#          timeout: 10m
-#          ignore-unfixed: true
-#           #severity: 'CRITICAL,HIGH'
-#      - name: Upload Trivy scan results to GitHub Security tab
-#        uses: github/codeql-action/upload-sarif@v2
-#        with:
-#          sarif_file: 'trivy-results.sarif'
   trivy-scan:
     name: Trivy fs scan
     runs-on: ubuntu-latest

.github/workflows/goreleaser-cd.yml

@@ -53,118 +53,3 @@ jobs:
           HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.HOMEBREW_TAP_GITHUB_TOKEN }}
           GORELEASER_CURRENT_TAG: ${{ github.ref_name }}
           GORELEASER_PREVIOUS_TAG: ${{ steps.release.outputs.prev }}
-
-  # Publish CLI / Cloud CLI container images
-  # publish:
-  #   strategy:
-  #     matrix:
-  #       image: [ plural-cli, plural-cli-cloud ]
-  #       include:
-  #         - image: plural-cli
-  #           dockerfile: ./Dockerfile
-  #         - image: plural-cli-cloud
-  #           dockerfile: ./dockerfiles/Dockerfile.cloud
-  #   runs-on: ubuntu-latest
-  #   needs: release
-  #   permissions:
-  #     contents: 'read'
-  #     id-token: 'write'
-  #     packages: 'write'
-  #     security-events: write
-  #     actions: read
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-  #     - name: Setup kubectl
-  #       uses: azure/setup-kubectl@v3
-  #     - name: Docker meta
-  #       id: meta
-  #       uses: docker/metadata-action@v4
-  #       with:
-  #         # list of Docker images to use as base name for tags
-  #         images: |
-  #           ghcr.io/pluralsh/${{ matrix.image }}
-  #         # generate Docker tags based on the following events/attributes
-  #         tags: |
-  #           type=semver,pattern={{version}}
-  #     # - name: Login to plural registry
-  #     #   uses: docker/login-action@v2
-  #     #   with:
-  #     #     registry: dkr.plural.sh
-  #     #     username: mjg@plural.sh
-  #     #     password: ${{ secrets.PLURAL_ACCESS_TOKEN }}
-  #     - name: Login to GHCR
-  #       uses: docker/login-action@v2
-  #       with:
-  #         registry: ghcr.io
-  #         username: ${{ github.repository_owner }}
-  #         password: ${{ secrets.GITHUB_TOKEN }}
-  #     - name: Get current date
-  #       id: date
-  #       run: echo "date=$(date -u +'%Y-%m-%dT%H:%M:%S%z')" >> $GITHUB_OUTPUT
-  #     - name: Set up Docker Buildx
-  #       uses: docker/setup-buildx-action@v3      
-  #     - name: Build and push
-  #       uses: docker/build-push-action@v6
-  #       with:
-  #         context: "."
-  #         file: "${{ matrix.dockerfile }}"
-  #         push: true
-  #         tags: ${{ steps.meta.outputs.tags }}
-  #         labels: ${{ steps.meta.outputs.labels }}
-  #         platforms: linux/amd64,linux/arm64
-  #         build-args: |
-  #           APP_VSN=${{ github.ref_name }}
-  #           APP_COMMIT=${{ github.sha }}
-  #           APP_DATE=${{ steps.date.outputs.date }}
-  #     - name: Run Trivy vulnerability scanner on image
-  #       uses: aquasecurity/trivy-action@master
-  #       with:
-  #         scan-type: 'image'
-  #         image-ref: ${{ fromJSON(steps.meta.outputs.json).tags[0] }}
-  #         hide-progress: false
-  #         format: 'sarif'
-  #         output: 'trivy-results.sarif'
-  #         scanners: 'vuln'
-  #         timeout: 10m
-  #         ignore-unfixed: true
-  #     - name: Upload Trivy scan results to GitHub Security tab
-  #       uses: github/codeql-action/upload-sarif@v2
-  #       with:
-  #         sarif_file: 'trivy-results.sarif'
-  # packer:
-  #   name: Build EKS AMI
-  #   runs-on: ubuntu-latest
-  #   needs: release
-  #   permissions:
-  #     contents: 'read'
-  #     id-token: 'write'
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-  #     - name: Configure AWS Credentials
-  #       uses: aws-actions/configure-aws-credentials@v4
-  #       with:
-  #         aws-region: us-east-2
-  #         role-to-assume: arn:aws:iam::654897662046:role/github-actions/plural-cli-amis-packer
-  #         role-session-name: CLIAmisPacker
-  #     - name: Setup `packer`
-  #       uses: hashicorp/setup-packer@main
-  #       id: setup
-  #       with:
-  #         version: 1.9.2
-  #     - name: Run `packer init`
-  #       id: init
-  #       run: "packer init ./packer/"
-  #     - name: Run `packer validate`
-  #       id: validate
-  #       env:
-  #         PKR_VAR_k8s_cli_version: ${{ github.ref_name}}
-  #       run: "packer validate ./packer/"
-  #     - name: Run `packer build`
-  #       id: build
-  #       # always is used here to ensure the builds can't get cancelled and leave dangling resources
-  #       if: always()
-  #       env:
-  #         PKR_VAR_k8s_cli_version: ${{ github.ref_name}}
-  #       run: "packer build ./packer/"

Dockerfile

@@ -25,10 +25,10 @@ ARG APP_DATE
 ARG TARGETARCH
 
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
-    go build -ldflags '-s -w \
-    -X "github.com/pluralsh/plural-cli/pkg/common.Version=${APP_VSN}" \
-    -X "github.com/pluralsh/plural-cli/pkg/common.Commit=${APP_COMMIT}" \
-    -X "github.com/pluralsh/plural-cli/pkg/common.Date=${APP_DATE}"' \
+    go build -ldflags "-s -w \
+    -X \"github.com/pluralsh/plural-cli/pkg/common.Version=${APP_VSN}\" \
+    -X \"github.com/pluralsh/plural-cli/pkg/common.Commit=${APP_COMMIT}\" \
+    -X \"github.com/pluralsh/plural-cli/pkg/common.Date=${APP_DATE}\"" \
     -o plural ./cmd/plural
 
 FROM golang:1.25.7-alpine3.22 AS final