Update docker-vault for FIPS releases (#276)

Signed-off-by: Alexander Scheel <[email protected]>

ubi/Makefile

@@ -3,21 +3,27 @@ export VERSION=1.10.3
 
 .PHONY: build ent-image oss-image
 
-build: ent-image oss-image
+build: ent-image oss-image fips-ent-image
 
 ent-image: export PROJECT_NAME=vault-enterprise
 ent-image: export TAG_SUFFIX=-ubi-ent
 ent-image:
 	docker build --label version=$(VERSION) --build-arg VAULT_VERSION=$(VERSION)+ent --no-cache -t $(REGISTRY_NAME)/$(PROJECT_NAME):$(VERSION)$(TAG_SUFFIX) .
 	@../scripts/tag-images.sh
 
+fips-ent-image: export PROJECT_NAME=vault-enterprise-fips
+fips-ent-image: export TAG_SUFFIX=-ent-ubi
+fips-ent-image:
+	docker build --label version=$(VERSION) --build-arg VAULT_VERSION=$(VERSION)+ent.fips1402 --no-cache -t $(REGISTRY_NAME)/$(PROJECT_NAME):$(VERSION)$(TAG_SUFFIX) .
+	@../scripts/tag-images.sh
+
 oss-image: export PROJECT_NAME=vault
 oss-image: export TAG_SUFFIX=-ubi
 oss-image:
 	docker build --label version=$(VERSION) --build-arg VAULT_VERSION=$(VERSION) --no-cache -t $(REGISTRY_NAME)/$(PROJECT_NAME):$(VERSION)$(TAG_SUFFIX) .
 	@../scripts/tag-images.sh
 
-push-images: oss-push-image ent-push-image
+push-images: oss-push-image ent-push-image fips-ent-push-image
 
 oss-push-image: export REGISTRY_KEY=${OSS_REGISTRY_KEY}
 oss-push-image: export VAULT_PID=${OSS_VAULT_PID}
@@ -34,3 +40,11 @@ ent-push-image: export PROJECT_NAME=vault-enterprise
 ent-push-image: export TAG_SUFFIX=-ubi-ent
 ent-push-image:
 	@./push_image.sh
+
+fips-ent-push-image: export REGISTRY_KEY=${FIPS_ENT_REGISTRY_KEY}
+fips-ent-push-image: export VAULT_PID=${FIPS_ENT_VAULT_PID}
+fips-ent-push-image: export VAULT_VERSION=$(VERSION)
+fips-ent-push-image: export PROJECT_NAME=vault-enterprise-fips
+fips-ent-push-image: export TAG_SUFFIX=-ent-ubi
+fips-ent-push-image:
+	@./push_image.sh

ubi/README.md

@@ -1,6 +1,6 @@
 # Vault Official UBI Image Build
 
-The UBI version of this hosted on [HashiCorp's Docker Hub for Vault](https://hub.docker.com/r/hashicorp/vault/).
+The UBI version of this hosted on [HashiCorp's Red Hat Registry for Vault](https://catalog.redhat.com/software/containers/hashicorp/vault/5fda55bd2937386820429e0c).
 
 There are several pieces that are used to build this image:
 
@@ -20,8 +20,10 @@ Set the registry key and project ID (PID) for enterprise and OSS and push the im
 
     export OSS_REGISTRY_KEY=...
     export ENT_REGISTRY_KEY=...
+    export FIPS_ENT_REGISTRY_KEY=...
     export OSS_VAULT_PID=...
     export ENT_VAULT_PID=...
+    export FIPS_ENT_VAULT_PID=...
     make push-images
 
 Part of the image push process will ask to press 'Enter' after verifying that