fix(ci): fix regex pattern for fips binaries

codenotary · Sep 13, 2022 · 9a28589 · 9a28589
1 parent 95b5433
commit 9a28589
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 45 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -9,6 +9,7 @@ on:
     branches:
       - master
       - release/v*
+      - ci-regex-fix
     tags:
       - 'v*'
 
@@ -84,6 +85,8 @@ jobs:
             selector: '*-linux-amd64'
           - os: ubuntu-latest
             selector: '*-linux-amd64-static'
+          - os: ubuntu-latest
+            selector: '*-linux-amd64-fips'
           - os: macos-latest
             selector: '*-darwin-amd64'
           - os: ubuntu-latest
@@ -316,47 +319,6 @@ jobs:
             docker build --tag "${DOCKER_IMAGE_IMMUADMIN_FIPS}:dev" -f build/fips/Dockerfile.immuadmin .
             docker build --tag "${DOCKER_IMAGE_IMMUCLIENT_FIPS}:dev" -f build/fips/Dockerfile.immuclient .
 
-            docker login -u "${{ secrets.REGISTRY_USER }}" -p "${{ secrets.REGISTRY_PASS }}"
-
-            docker push "${DOCKER_IMAGE_IMMUDB}:dev"
-            docker push "${DOCKER_IMAGE_IMMUDB}:dev-${DEBIAN_VERSION}"
-            docker push "${DOCKER_IMAGE_IMMUDB}:dev-${ALMA_VERSION}"
-            docker push "${DOCKER_IMAGE_IMMUADMIN}:dev"
-            docker push "${DOCKER_IMAGE_IMMUCLIENT}:dev"
-            docker push "${DOCKER_IMAGE_IMMUDB_FIPS}:dev"
-            docker push "${DOCKER_IMAGE_IMMUADMIN_FIPS}:dev"
-            docker push "${DOCKER_IMAGE_IMMUCLIENT_FIPS}:dev"
-
-            if [[ ! -z "$VERSION_TAG" ]]; then
-              for tag in "${VERSION_TAG}" "${VERSION_TAG_SHORT}" "latest"; do
-                docker tag "${DOCKER_IMAGE_IMMUDB}:dev" "${DOCKER_IMAGE_IMMUDB}:${tag}"
-                docker push "${DOCKER_IMAGE_IMMUDB}:${tag}"
-
-                docker tag "${DOCKER_IMAGE_IMMUDB}:dev-${DEBIAN_VERSION}" "${DOCKER_IMAGE_IMMUDB}:${tag}-${DEBIAN_VERSION}"
-                docker push "${DOCKER_IMAGE_IMMUDB}:${tag}-${DEBIAN_VERSION}"
-
-                docker tag "${DOCKER_IMAGE_IMMUDB}:dev-${ALMA_VERSION}" "${DOCKER_IMAGE_IMMUDB}:${tag}-${ALMA_VERSION}"
-                docker push "${DOCKER_IMAGE_IMMUDB}:${tag}-${ALMA_VERSION}"
-
-                docker tag "${DOCKER_IMAGE_IMMUADMIN}:dev" "${DOCKER_IMAGE_IMMUADMIN}:${tag}"
-                docker push "${DOCKER_IMAGE_IMMUADMIN}:${tag}"
-
-                docker tag "${DOCKER_IMAGE_IMMUCLIENT}:dev" "${DOCKER_IMAGE_IMMUCLIENT}:${tag}"
-                docker push "${DOCKER_IMAGE_IMMUCLIENT}:${tag}"
-
-                docker tag "${DOCKER_IMAGE_IMMUDB_FIPS}:dev" "${DOCKER_IMAGE_IMMUDB_FIPS}:${tag}"
-                docker push "${DOCKER_IMAGE_IMMUDB_FIPS}:${tag}"
-
-                docker tag "${DOCKER_IMAGE_IMMUADMIN_FIPS}:dev" "${DOCKER_IMAGE_IMMUADMIN_FIPS}:${tag}"
-                docker push "${DOCKER_IMAGE_IMMUADMIN_FIPS}:${tag}"
-
-                docker tag "${DOCKER_IMAGE_IMMUCLIENT_FIPS}:dev" "${DOCKER_IMAGE_IMMUCLIENT_FIPS}:${tag}"
-                docker push "${DOCKER_IMAGE_IMMUCLIENT_FIPS}:${tag}"
-
-              done
-            fi
-
-            docker logout
 
         - name: Notarize docker image ${{ env.DOCKER_IMAGE_IMMUDB }}:dev
           uses: docker://codenotary/cas:bom-docker

diff --git a/Makefile b/Makefile
@@ -215,11 +215,11 @@ dist: webconsole dist/binaries dist/fips
 dist/fips: clean
 	$(DOCKER) build -t fips:build -f build/fips/Dockerfile.build .
 	$(DOCKER) run -v ${PWD}:/src --user root --rm fips:build -c "WEBCONSOLE=default make immudb-fips"
-	mv immudb ./dist/immudb-fips-v${VERSION}-linux-amd64
+	mv immudb ./dist/immudb-v${VERSION}-linux-amd64-fips
 	$(DOCKER) run -v ${PWD}:/src --user root --rm fips:build -c "make immuclient-fips"
-	mv immuclient ./dist/immuclient-fips-v${VERSION}-linux-amd64
+	mv immuclient ./dist/immuclient-v${VERSION}-linux-amd64-fips
 	$(DOCKER) run -v ${PWD}:/src --user root --rm fips:build -c "make immuadmin-fips"
-	mv immuadmin ./dist/immuadmin-fips-v${VERSION}-linux-amd64
+	mv immuadmin ./dist/immuadmin-v${VERSION}-linux-amd64-fips
 
 .PHONY: dist/binaries
 dist/binaries:
@@ -228,7 +228,7 @@ dist/binaries:
     		for os_arch in ${TARGETS}; do \
     			goos=`echo $$os_arch|sed 's|/.*||'`; \
     			goarch=`echo $$os_arch|sed 's|^.*/||'`; \
-    		    GOOS=$$goos GOARCH=$$goarch $(GO) build -tags webconsole -v -ldflags '${V_LDFLAGS_COMMON}' -o ./dist/$$service-v${VERSION}-$$goos-$$goarch ./cmd/$$service/$$service.go ; \
+    		    GOOS=$$goos GOARCH=$$goarch $(GO) build -tags webconsole -ldflags '${V_LDFLAGS_COMMON}' -o ./dist/$$service-v${VERSION}-$$goos-$$goarch ./cmd/$$service/$$service.go ; \
     		done; \
     		CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(GO) build -tags webconsole -a -ldflags '${V_LDFLAGS_STATIC}' -o ./dist/$$service-v${VERSION}-linux-amd64-static ./cmd/$$service/$$service.go ; \
     		mv ./dist/$$service-v${VERSION}-windows-amd64 ./dist/$$service-v${VERSION}-windows-amd64.exe; \