Fix merge conflicts (#223)

spiffe · May 22, 2023 · 0c40752 · 0c40752
2 parents de39249 + bb1b5ce
commit 0c40752
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Dockerfile.frontend-container b/Dockerfile.frontend-container
@@ -32,4 +32,4 @@ ENV GITHUB_SHA=$github_sha
 
 RUN npm install --omit=dev \
     npm prune --production
-ENTRYPOINT npx react-inject-env set && npx serve build -p $PORT_FE
+ENTRYPOINT npx react-inject-env set && serve -s build -p $PORT_FE
diff --git a/Makefile b/Makefile
@@ -1,6 +1,7 @@
 .PHONY: ui vendor build container-tornjak-backend-spire container-tornjak-backend-spire-push container-manager container-manager-push release-tornjak-backend-spire-multiversions push container-frontend container-frontend-push container-tornjak-backend container-tornjak-backend-push
 
 VERSION=$(shell cat version.txt)
+GITHUB_SHA="$(shell git rev-parse HEAD 2>/dev/null)"
 
 CONTAINER_TAG ?= tsidentity/tornjak:$(VERSION)
 CONTAINER_BACKEND_TAG ?= tsidentity/tornjak-backend:$(VERSION)