From bb1b5cee6b56d4df54abcdc0762792f7fd3b0c26 Mon Sep 17 00:00:00 2001 From: Mariusz Sabath Date: Fri, 19 May 2023 17:21:16 -0400 Subject: [PATCH] Fix merge conflicts Signed-off-by: Mariusz Sabath --- Dockerfile.frontend-container | 2 +- Makefile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile.frontend-container b/Dockerfile.frontend-container index 1d25b00c..23514667 100644 --- 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 index a3790363..99257c6b 100644 --- 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)