Merge remote-tracking branch 'origin' into Connect-Search-Filter

stakwork · Oct 15, 2024 · a1c633e · a1c633e
2 parents cbdd26b + cbbe490
commit a1c633e
Show file tree

Hide file tree

Showing 224 changed files with 7,322 additions and 4,176 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -53,7 +53,7 @@ jobs:
           cache: "yarn"
       - name: Clone Stack
         run: |
-          git clone https://github.com/stakwork/sphinx-stack.git stack
+          git clone -b multipleWorkers https://github.com/stakwork/sphinx-stack.git stack
 
       - name: Give Permissions to Sphinx Nav Fiber
         run: chmod 777 -R relay

diff --git a/Dockerfile b/Dockerfile
@@ -28,3 +28,4 @@ RUN yarn run build-docker
 
 FROM nginx:alpine
 COPY --from=build /usr/src/app/build /usr/share/nginx/html
+COPY --from=build /usr/src/app/deploy/nginx.conf /etc/nginx/conf.d/default.conf
diff --git a/build/AbcIcon.svg b/build/AbcIcon.svg
diff --git a/build/AlphabetIcon.svg b/build/AlphabetIcon.svg
diff --git a/build/BookIcon.svg b/build/BookIcon.svg
diff --git a/build/BrowseIcon.svg b/build/BrowseIcon.svg
diff --git a/build/CalculateIcon.svg b/build/CalculateIcon.svg
diff --git a/build/CalculatorIcon.svg b/build/CalculatorIcon.svg
diff --git a/build/ConnectionIcon.svg b/build/ConnectionIcon.svg
diff --git a/build/DeployedCodeIcon.svg b/build/DeployedCodeIcon.svg
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,3 +28,4 @@ RUN yarn run build-docker

		FROM nginx:alpine
		COPY --from=build /usr/src/app/build /usr/share/nginx/html
		COPY --from=build /usr/src/app/deploy/nginx.conf /etc/nginx/conf.d/default.conf