fix build for web-client

12 months ago · 49c01169d3
parent b4fd08f40f
commit 49c01169d3
7 changed files with 41 additions and 39 deletions
--- a/42
+++ b/42
@ -16,7 +16,7 @@ clobber:


 SERVICE = "catalog"
-ENV = "beta"
+ENV = ""
 ORIGIN = "https://barretthousen.com"
 BUILD_INITIATOR = "Development Machine"
 VERSION = $(shell git rev-parse --verify --short HEAD)
@ -25,7 +25,7 @@ BUILD_DATE := $(shell date +%Y-%m-%d-%T)

 .PHONY: build-client-image
 build-client-image:
-	docker build \
+	docker build --target=production \
 		--label 'com.barretthousen.service=$(SERVICE)' \
 		--label 'com.barretthousen.version=$(VERSION)' \
 		--label 'com.barretthousen.git-ref=$(GIT_REF)' \
@ -34,31 +34,30 @@ build-client-image:
 		--build-arg 'origin=$(ORIGIN)' \
 		-t barretthousen/client-$(SERVICE):$(VERSION) \
 		-t git.vdhsn.com/barretthousen/client-$(SERVICE):$(VERSION) \
-		-t git.vdhsn.com/barretthousen/client-$(SERVICE):$(ENV) \
 		-f ./src/$(SERVICE)/Dockerfile.frontend ./src/$(SERVICE)
-	docker push git.vdhsn.com/barretthousen/client-$(SERVICE):$(VERSION)
-	docker push git.vdhsn.com/barretthousen/client-$(SERVICE):$(ENV)
+
+	@[ ! -z $(ENV) ] && docker tag git.vdhsn.com/barretthousen/client-$(SERVICE):$(VERSION) git.vdhsn.com/barretthousen/client-$(SERVICE):$(ENV) || true
+	@[ ! -z $(ENV) ] && docker push git.vdhsn.com/barretthousen/client-$(SERVICE):$(VERSION) || true
+	@[ ! -z $(ENV) ] && docker push git.vdhsn.com/barretthousen/client-$(SERVICE):$(ENV) || true


 .PHONY: build-backend-image
 build-backend-image:
-	docker build \
-				--label 'com.barretthousen.service=$(SERVICE)' \
-				--label 'com.barretthousen.version="$(VERSION)"' \
-				--label 'com.barretthousen.git-ref="$(GIT_REF)"' \
-				--label 'com.barretthousen.build-date=$(BUILD_DATE)' \
-				--label 'com.barrethousen.builder=$(BUILD_INITIATOR)' \
-				--build-arg "service=$(SERVICE)" \
-				-t barretthousen/service-$(SERVICE):$(VERSION) \
-				-t git.vdhsn.com/barretthousen/service-$(SERVICE):$(VERSION) \
-				-t git.vdhsn.com/barretthousen/service-$(SERVICE):$(ENV) \
-				-f ./src/Dockerfile.prod-backend ./src
-	docker push git.vdhsn.com/barretthousen/service-$(SERVICE):$(VERSION)
-	docker push git.vdhsn.com/barretthousen/service-$(SERVICE):$(ENV)
-
-.PHONY: push-image
-push-image:
+	docker build --target=production \
+		--label 'com.barretthousen.service=$(SERVICE)' \
+		--label 'com.barretthousen.version="$(VERSION)"' \
+		--label 'com.barretthousen.git-ref="$(GIT_REF)"' \
+		--label 'com.barretthousen.build-date=$(BUILD_DATE)' \
+		--label 'com.barrethousen.builder=$(BUILD_INITIATOR)' \
+		--build-arg 'service=$(SERVICE)' \
+		-t barretthousen/service-$(SERVICE):$(VERSION) \
+		-t git.vdhsn.com/barretthousen/service-$(SERVICE):$(VERSION) \
+		-t git.vdhsn.com/barretthousen/service-$(SERVICE):$(ENV) \
+		-f ./src/Dockerfile.prod-backend ./src

+	@[ ! -z $(ENV) ] && docker tag git.vdhsn.com/barretthousen/service-$(SERVICE):$(VERSION) git.vdhsn.com/barretthousen/service-$(SERVICE):$(ENV) || true
+	@[ ! -z $(ENV) ] && docker push git.vdhsn.com/barretthousen/service-$(SERVICE):$(VERSION) || true
+	@[ ! -z $(ENV) ] && docker push git.vdhsn.com/barretthousen/service-$(SERVICE):$(ENV) || true

 .PHONY: acceptance-test
 acceptance-test:
@ -77,6 +76,7 @@ gen: $(GOBIN)/sqlc buf.lock
 .PHONY: setup
 setup: $(GOBIN)/sqlc $(GOBIN)/buf ./env/.age.txt
 	@asdf install || true
+	@docker login git.vdhsn.com

 buf.lock: $(GOBIN)/buf
 	@$(GOBIN)/buf mod update ./src
--- a/2
+++ b/2
@ -133,7 +133,7 @@ bh_backend_service(service="proxy-client", port_forwards=[
 docker_build(
    ref='barretthousen/service-web-client',
    context='./src/web-client',
-    dockerfile='./src/web-client/Dockerfile.frontend',
+    dockerfile='./src/web-client/Dockerfile.dev-frontend',
    target='development'
 )
 k8s_resource(
--- a/src/.dockerignore
+++ b/src/.dockerignore
@ -0,0 +1,2 @@
+web-client
+.idea
--- a/src/web-client/.dockerignore
+++ b/src/web-client/.dockerignore
@ -0,0 +1 @@
+build
--- a/src/web-client/Dockerfile.dev-frontend
+++ b/src/web-client/Dockerfile.dev-frontend
@ -0,0 +1,9 @@
+FROM node:lts AS development
+
+COPY . /opt/web-client
+
+WORKDIR /opt/web-client
+
+RUN npm install && npm install -g vite
+
+CMD vite dev --port=80 --host=0.0.0.0 --strictPort --logLevel info
--- a/src/web-client/Dockerfile.frontend
+++ b/src/web-client/Dockerfile.frontend
@ -1,18 +1,7 @@
-FROM node:lts AS development
-
-COPY . /opt/web-client
-
-WORKDIR /opt/web-client
-
-RUN npm install && npm install -g vite
-
-CMD vite dev --port=80 --host=0.0.0.0 --strictPort --logLevel info
-
 FROM node:lts AS build

 ARG origin=https://barretthousen.com

-ENV ENV=production

 ENV PROTOCOL_HEADER=x-forwarded-proto
 ENV HOST_HEADER=x-forwarded-host
@ -21,11 +10,12 @@ ENV ORIGIN=${origin}

 WORKDIR /opt/web-client

-COPY --from=development /opt/web-client .
+COPY . /opt/web-client

 RUN npm run build \
-	&& cp -rv /opt/web-client/package.json /opt/web-client/build \
-	&& cp -rv /opt/web-client/package-lock.json /opt/web-client/build
+	&& cp -v /opt/web-client/package.json /opt/web-client/build \
+	&& cp -v /opt/web-client/package-lock.json /opt/web-client/build \
+	&& cd /opt/web-client/build && npm ci --omit dev

 FROM node:lts AS production

@ -45,7 +35,7 @@ ENV ORIGIN=${origin}

 WORKDIR /opt

-COPY --from=build /opt/web-client/build/* /opt/web-client
+COPY --from=build /opt/web-client/build/ /opt/web-client/

 ENV PORT 80

--- a/src/web-client/package.json
+++ b/src/web-client/package.json
@ -2,6 +2,7 @@
 	"name": "web-client",
 	"version": "0.0.1",
 	"private": true,
+	"main": "index.js",
 	"scripts": {
 		"dev": "vite dev --port 8080",
 		"build": "vite build",
@ -38,7 +39,6 @@
 	},
 	"type": "module",
 	"dependencies": {
-		"luxon": "^3.3.0",
-		"moment": "^2.29.4"
+		"luxon": "^3.3.0"
 	}
 }