Merge pull request #8609 from infor-design/fix/node-sass

fixes to the enterprise release pipeline
infor-design · Apr 9, 2024 · 4edb569 · 4edb569
2 parents 7fc3fee + 8565982
commit 4edb569
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 18 deletions.
diff --git a/scripts/publish-docs/Makefile b/scripts/publish-docs/Makefile
@@ -1,7 +1,7 @@
 CURRENT_DIR=$(shell pwd)
 ORGANIZATION = hookandloop
 IMAGE = enterprise-publish-docs
-IMAGE_TAG = 0.0.2
+IMAGE_TAG = 1.0.0
 
 
 ifneq (,$(wildcard ./.env))

diff --git a/scripts/publish-docs/job.yaml b/scripts/publish-docs/job.yaml
@@ -31,11 +31,11 @@ spec:
                   name: docs-api-key
                   key: token
             - name: DOCS_API_URL
-              value: "https://old.design.infor.com"
+              value: "https://legacy.design.infor.com"
             - name: SITE
               value: "prod"
             - name: BUILD_FROM
-              value: "4.91.0"
+              value: "4.93.0"
             - name: APP_REPO
               value: "infor-design/enterprise"
           command: ["/bin/bash"]

diff --git a/scripts/release/Dockerfile b/scripts/release/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:14-buster
+FROM node:18
 
 WORKDIR /usr/src
 

diff --git a/scripts/release/Makefile b/scripts/release/Makefile
@@ -1,19 +1,37 @@
+CURRENT_DIR=$(shell pwd)
+
 ORGANIZATION = hookandloop
-WORKER_CONTAINER_NAME = enterprise-release
-WORKER_CONTAINER_VERSION = 1.0.0
+IMAGE = enterprise-release
+IMAGE_TAG = 1.0.1
+
 
 ifneq (,$(wildcard ./.env))
 	include .env
 	export
 endif
 
-.PHONY: build-worker-image
-build-worker-image :
-	docker build -t $(ORGANIZATION)/$(WORKER_CONTAINER_NAME):$(WORKER_CONTAINER_VERSION) .
 
-.PHONY: run-worker
-run-worker :
-	docker run --rm --name $(WORKER_CONTAINER_NAME) \
+.PHONY: all
+all: build tag push
+
+.PHONY: build
+build:
+	DOCKER_BUILDKIT=1 docker build \
+		--platform=linux/amd64 \
+		-t $(IMAGE):$(IMAGE_TAG) \
+		-f $(CURRENT_DIR)/Dockerfile .
+
+.PHONY: tag
+tag:
+	docker tag $(IMAGE):$(IMAGE_TAG) $(ORGANIZATION)/$(IMAGE):$(IMAGE_TAG)
+
+.PHONY: push
+push:
+	docker push $(ORGANIZATION)/$(IMAGE):$(IMAGE_TAG)
+
+.PHONY: run
+run :
+	docker run --rm --name $(IMAGE) \
 		--env GITHUB_ACCESS_TOKEN=${GITHUB_ACCESS_TOKEN} \
 		--env DOCS_API_KEY=${DOCS_API_KEY} \
 		--env DOCS_API_URL=${DOCS_API_URL} \
@@ -27,11 +45,12 @@ run-worker :
 		-v ${PWD}/build:/root/enterprise \
 		-v ${PWD}/.gitconfig:/root/.gitconfig \
 		-v ${PWD}/run.sh:/usr/src/run.sh \
-		$(ORGANIZATION)/$(WORKER_CONTAINER_NAME):$(WORKER_CONTAINER_VERSION)
+		$(ORGANIZATION)/$(IMAGE):$(IMAGE_TAG)
 
-.PHONY: shell-worker
-shell-worker :
-	docker run -it --rm --name $(WORKER_CONTAINER_NAME) \
+.PHONY: shell
+shell :
+	docker run -it --rm --name $(IMAGE) \
+		--platform=linux/amd64 \
 		--entrypoint /bin/bash \
 		--env GITHUB_ACCESS_TOKEN=${GITHUB_ACCESS_TOKEN} \
 		--env DOCS_API_KEY=${DOCS_API_KEY} \
@@ -46,4 +65,4 @@ shell-worker :
 		-v ${PWD}/build:/root/enterprise \
 		-v ${PWD}/.gitconfig:/root/.gitconfig \
 		-v ${PWD}/run.sh:/usr/src/run.sh \
-		$(ORGANIZATION)/$(WORKER_CONTAINER_NAME):$(WORKER_CONTAINER_VERSION)
+		$(ORGANIZATION)/$(IMAGE):$(IMAGE_TAG)
diff --git a/scripts/release/job.yaml b/scripts/release/job.yaml
@@ -39,7 +39,7 @@ spec:
                   name: docs-api-key
                   key: token
             - name: DOCS_API_URL
-              value: "https://old.design.infor.com"
+              value: "https://legacy.design.infor.com"
             - name: NPM_TOKEN
               valueFrom:
                 secretKeyRef: