diff --git a/.github/workflows/docker-helm.yml b/.github/workflows/docker-helm.yml index e9b3a8d0..8a025c47 100644 --- a/.github/workflows/docker-helm.yml +++ b/.github/workflows/docker-helm.yml @@ -104,6 +104,8 @@ jobs: build-args: | BUILD_SHA=${{ steps.extract_info.outputs.head }} BUILD_VERSION=${{ steps.tag_bump.outputs.new_tag }} + private_repo=github.com/AccessibleAI/cnvrg-shim + git_auth=${{ secrets.CNVRG_RUNNER_AUTH }} - name: Build and push tagged image id: docker_build_tag_branch @@ -117,6 +119,8 @@ jobs: build-args: | BUILD_SHA=${{ steps.extract_info.outputs.head }} BUILD_VERSION=${{ steps.tag_bump.outputs.new_tag }} + private_repo=github.com/AccessibleAI/cnvrg-shim + git_auth=${{ secrets.CNVRG_RUNNER_AUTH }} - name: Generate Cnvrg Changelog uses: AccessibleAI/github-changelog-action@1.0.0 diff --git a/Dockerfile b/Dockerfile index f44d99f5..aaac686d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,9 @@ # Build the manager binary FROM golang:1.21.1 as builder ARG git_auth -ENV GOPRIVATE=github.com/AccessibleAI/cnvrg-shim +ARG private_repo + +ENV GOPRIVATE=$private_repo WORKDIR /workspace RUN git config --global --add url.https://$git_auth@github.com/.insteadOf https://github.com/ # Copy the Go Modules manifests diff --git a/pkg/app/dbs/tmpl/minio/svc.tpl b/pkg/app/dbs/tmpl/minio/svc.tpl index 384162d2..b623ce03 100644 --- a/pkg/app/dbs/tmpl/minio/svc.tpl +++ b/pkg/app/dbs/tmpl/minio/svc.tpl @@ -21,10 +21,10 @@ spec: {{- end }} ports: - name: http - port: 80 + port: {{ .Spec.Dbs.Minio.Port }} targetPort: {{ .Spec.Dbs.Minio.Port }} {{- if eq .Spec.Networking.Ingress.Type "nodeport" }} nodePort: {{ .Spec.Dbs.Minio.NodePort }} {{- end }} selector: - app: {{ .Spec.Dbs.Minio.SvcName }} \ No newline at end of file + app: {{ .Spec.Dbs.Minio.SvcName }}