fix dockerfile

ee/docker/ee.Dockerfile

@@ -15,7 +15,6 @@ COPY /ee ./ee
 COPY /scripts ./scripts
 COPY /provisioner ./provisioner
 COPY /pkg ./pkg
-COPY /workers ./workers
 
 RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.26
 RUN go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.1
@@ -36,8 +35,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=$GOPATH/pkg/mod \
     go build -ldflags="-w -s -X 'main.Version=${version}'" -tags ee -a -o ./bin/app ./cmd/app && \
     go build -ldflags '-w -s' -a -tags ee -o ./bin/migrate ./cmd/migrate && \
-    go build -ldflags '-w -s' -a -tags ee -o ./bin/ready ./cmd/ready && \
-    go build -ldflags '-w -s' -a -tags ee -o ./bin/worker-pool ./workers
+    go build -ldflags '-w -s' -a -tags ee -o ./bin/ready ./cmd/ready
 
 # Go test environment
 # -------------------
@@ -68,7 +66,6 @@ RUN apk update
 COPY --from=build-go /porter/bin/app /porter/
 COPY --from=build-go /porter/bin/migrate /porter/
 COPY --from=build-go /porter/bin/ready /porter/
-COPY --from=build-go /porter/bin/worker-pool /porter/worker-pool
 COPY --from=build-webpack /webpack/build /porter/static
 
 ENV DEBUG=false
@@ -84,4 +81,4 @@ ENV SQL_LITE=true
 ENV ADMIN_INIT=false
 
 EXPOSE 8080
-CMD /porter/migrate && /porter/app && /porter/worker-pool&
+CMD /porter/migrate && /porter/app

workers/Dockerfile

@@ -3,11 +3,17 @@
 FROM golang:1.18-alpine3.16 as build
 WORKDIR /app
 
-RUN apk update && apk add gcc musl-dev
+RUN apk update && apk add gcc binutils-gold musl-dev
 
-COPY . .
+COPY go.mod .
+COPY go.sum .
+COPY /api ./api
+COPY /ee ./ee
+COPY /internal ./internal
+COPY /pkg ./pkg
+COPY /workers ./workers
 
-RUN go build -ldflags '-w -s' -tags ee -a -o ./bin/worker-pool .
+RUN go build -ldflags '-w -s' -tags ee -a -o ./bin/worker-pool ./workers
 
 # Deployment environment
 # ----------------------

workers/jobs/helm_revisions_count_tracker.go

@@ -77,7 +77,7 @@ func NewHelmRevisionsCountTracker(
 	})
 
 	return &helmRevisionsCountTracker{
-		enqueueTime, db, repo, doConf, opts.DBConf, opts.WhitelistedUsers, credBackend,
+		enqueueTime, db, repo, doConf, opts.DBConf, credBackend,
 	}, nil
 }