dockerfiles:bugfix - fixing error with diferent migration binary name (…

…#500) Signed-off-by: Nathan Martins <[email protected]> Co-authored-by: Wilian Gabriel <[email protected]>
ZupIT · Dec 29, 2021 · 2fb0855 · 2fb0855
1 parent 5477336
commit 2fb0855
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/analytic/deployments/dockerfiles/Dockerfile b/analytic/deployments/dockerfiles/Dockerfile
@@ -23,11 +23,11 @@ WORKDIR /analytic
 RUN go get -t -v -d ./...
 
 RUN GOOS=linux go build -a -o horusec-analytic-main ./cmd/app/main.go
-RUN GOOS=linux go build -a -o horusec-analytic-v1-to-v2-migrate ./cmd/migration/v2/main.go
+RUN GOOS=linux go build -a -o horusec-analytic-migrate-v1-v2 ./cmd/migration/v2/main.go
 
 FROM alpine:3.15.0
 
 COPY --from=builder /analytic/horusec-analytic-main .
-COPY --from=builder /analytic/horusec-analytic-v1-to-v2-migrate .
+COPY --from=builder /analytic/horusec-analytic-migrate-v1-v2 .
 
 ENTRYPOINT ["./horusec-analytic-main"]
diff --git a/analytic/deployments/dockerfiles/Dockerfile.goreleaser b/analytic/deployments/dockerfiles/Dockerfile.goreleaser
@@ -1,5 +1,8 @@
 FROM alpine
 
 COPY horusec-analytic /
+
+# migration bin name is used in horusec operator, any change should be reflected there.
 COPY horusec-analytic-migrate-v1-v2 /
+
 ENTRYPOINT ["./horusec-analytic"]
diff --git a/api/deployments/dockerfiles/Dockerfile b/api/deployments/dockerfiles/Dockerfile
@@ -23,11 +23,11 @@ WORKDIR /api
 RUN go get -t -v -d ./...
 
 RUN GOOS=linux go build -a -o horusec-api-main ./cmd/app/main.go
-RUN GOOS=linux go build -a -o horusec-api-v1-to-v2-migrate ./cmd/migration/v2/main.go
+RUN GOOS=linux go build -a -o horusec-api-migrate-v1-v2 ./cmd/migration/v2/main.go
 
 FROM alpine:3.15.0
 
 COPY --from=builder /api/horusec-api-main .
-COPY --from=builder /api/horusec-api-v1-to-v2-migrate .
+COPY --from=builder /api/horusec-api-migrate-v1-v2 .
 
 ENTRYPOINT ["./horusec-api-main"]
diff --git a/api/deployments/dockerfiles/Dockerfile.goreleaser b/api/deployments/dockerfiles/Dockerfile.goreleaser
@@ -1,5 +1,8 @@
 FROM alpine
 
 COPY horusec-api /
+
+# migration bin name is used in horusec operator, any change should be reflected there.
 COPY horusec-api-migrate-v1-v2 /
+
 ENTRYPOINT ["./horusec-api"]
diff --git a/e2e/cypress/Makefile b/e2e/cypress/Makefile
@@ -18,7 +18,7 @@ migrate-horusec-postgresql:
 	$(CD) ../.. && $(MAKE) migrate-drop && $(MAKE) migrate-up && $(CD) ./e2e/cypress
 
 test-e2e-install:
-	$(NPM) install && $(NPX) browserslist@latest --update-db
+	$(NPM) install && npm_config_yes=true $(NPX) browserslist@latest --update-db
 
 test-e2e-auth-horusec-without-application-admin: test-e2e-install compose-e2e-auth-horusec-without-application-admin
 	$(NPM) run test::auth-horusec::without-application-admin