From 7814a38e884a5b20513cc1403b91baa0c3488c30 Mon Sep 17 00:00:00 2001 From: Jennifer Echenim Date: Wed, 21 Aug 2024 15:54:50 +0400 Subject: [PATCH 1/3] move bridge frontend to tools folder --- .../bridge-frontend}/.eslintrc.json | 0 .../frontend => tools/bridge-frontend}/.gitignore | 0 .../frontend => tools/bridge-frontend}/Dockerfile | 0 .../frontend => tools/bridge-frontend}/README.md | 0 .../bridge-frontend}/components.json | 0 .../frontend => tools/bridge-frontend}/env.example | 0 .../bridge-frontend}/next.config.js | 0 .../bridge-frontend}/package-lock.json | 0 .../frontend => tools/bridge-frontend}/package.json | 0 .../bridge-frontend}/pages/_app.tsx | 0 .../bridge-frontend}/pages/_document.tsx | 0 .../bridge-frontend}/pages/index.tsx | 0 .../bridge-frontend}/postcss.config.js | 0 .../bridge-frontend}/public/favicon.ico | Bin .../bridge-frontend}/src/lib/constants.ts | 0 .../bridge-frontend}/tsconfig.json | 0 .../frontend => tools/bridge-frontend}/vercel.json | 0 17 files changed, 0 insertions(+), 0 deletions(-) rename {contracts/src/bridge/frontend => tools/bridge-frontend}/.eslintrc.json (100%) rename {contracts/src/bridge/frontend => tools/bridge-frontend}/.gitignore (100%) rename {contracts/src/bridge/frontend => tools/bridge-frontend}/Dockerfile (100%) rename {contracts/src/bridge/frontend => tools/bridge-frontend}/README.md (100%) rename {contracts/src/bridge/frontend => tools/bridge-frontend}/components.json (100%) rename {contracts/src/bridge/frontend => tools/bridge-frontend}/env.example (100%) rename {contracts/src/bridge/frontend => tools/bridge-frontend}/next.config.js (100%) rename {contracts/src/bridge/frontend => tools/bridge-frontend}/package-lock.json (100%) rename {contracts/src/bridge/frontend => tools/bridge-frontend}/package.json (100%) rename {contracts/src/bridge/frontend => tools/bridge-frontend}/pages/_app.tsx (100%) rename {contracts/src/bridge/frontend => tools/bridge-frontend}/pages/_document.tsx (100%) rename {contracts/src/bridge/frontend => tools/bridge-frontend}/pages/index.tsx (100%) rename {contracts/src/bridge/frontend => tools/bridge-frontend}/postcss.config.js (100%) rename {contracts/src/bridge/frontend => tools/bridge-frontend}/public/favicon.ico (100%) rename {contracts/src/bridge/frontend => tools/bridge-frontend}/src/lib/constants.ts (100%) rename {contracts/src/bridge/frontend => tools/bridge-frontend}/tsconfig.json (100%) rename {contracts/src/bridge/frontend => tools/bridge-frontend}/vercel.json (100%) diff --git a/contracts/src/bridge/frontend/.eslintrc.json b/tools/bridge-frontend/.eslintrc.json similarity index 100% rename from contracts/src/bridge/frontend/.eslintrc.json rename to tools/bridge-frontend/.eslintrc.json diff --git a/contracts/src/bridge/frontend/.gitignore b/tools/bridge-frontend/.gitignore similarity index 100% rename from contracts/src/bridge/frontend/.gitignore rename to tools/bridge-frontend/.gitignore diff --git a/contracts/src/bridge/frontend/Dockerfile b/tools/bridge-frontend/Dockerfile similarity index 100% rename from contracts/src/bridge/frontend/Dockerfile rename to tools/bridge-frontend/Dockerfile diff --git a/contracts/src/bridge/frontend/README.md b/tools/bridge-frontend/README.md similarity index 100% rename from contracts/src/bridge/frontend/README.md rename to tools/bridge-frontend/README.md diff --git a/contracts/src/bridge/frontend/components.json b/tools/bridge-frontend/components.json similarity index 100% rename from contracts/src/bridge/frontend/components.json rename to tools/bridge-frontend/components.json diff --git a/contracts/src/bridge/frontend/env.example b/tools/bridge-frontend/env.example similarity index 100% rename from contracts/src/bridge/frontend/env.example rename to tools/bridge-frontend/env.example diff --git a/contracts/src/bridge/frontend/next.config.js b/tools/bridge-frontend/next.config.js similarity index 100% rename from contracts/src/bridge/frontend/next.config.js rename to tools/bridge-frontend/next.config.js diff --git a/contracts/src/bridge/frontend/package-lock.json b/tools/bridge-frontend/package-lock.json similarity index 100% rename from contracts/src/bridge/frontend/package-lock.json rename to tools/bridge-frontend/package-lock.json diff --git a/contracts/src/bridge/frontend/package.json b/tools/bridge-frontend/package.json similarity index 100% rename from contracts/src/bridge/frontend/package.json rename to tools/bridge-frontend/package.json diff --git a/contracts/src/bridge/frontend/pages/_app.tsx b/tools/bridge-frontend/pages/_app.tsx similarity index 100% rename from contracts/src/bridge/frontend/pages/_app.tsx rename to tools/bridge-frontend/pages/_app.tsx diff --git a/contracts/src/bridge/frontend/pages/_document.tsx b/tools/bridge-frontend/pages/_document.tsx similarity index 100% rename from contracts/src/bridge/frontend/pages/_document.tsx rename to tools/bridge-frontend/pages/_document.tsx diff --git a/contracts/src/bridge/frontend/pages/index.tsx b/tools/bridge-frontend/pages/index.tsx similarity index 100% rename from contracts/src/bridge/frontend/pages/index.tsx rename to tools/bridge-frontend/pages/index.tsx diff --git a/contracts/src/bridge/frontend/postcss.config.js b/tools/bridge-frontend/postcss.config.js similarity index 100% rename from contracts/src/bridge/frontend/postcss.config.js rename to tools/bridge-frontend/postcss.config.js diff --git a/contracts/src/bridge/frontend/public/favicon.ico b/tools/bridge-frontend/public/favicon.ico similarity index 100% rename from contracts/src/bridge/frontend/public/favicon.ico rename to tools/bridge-frontend/public/favicon.ico diff --git a/contracts/src/bridge/frontend/src/lib/constants.ts b/tools/bridge-frontend/src/lib/constants.ts similarity index 100% rename from contracts/src/bridge/frontend/src/lib/constants.ts rename to tools/bridge-frontend/src/lib/constants.ts diff --git a/contracts/src/bridge/frontend/tsconfig.json b/tools/bridge-frontend/tsconfig.json similarity index 100% rename from contracts/src/bridge/frontend/tsconfig.json rename to tools/bridge-frontend/tsconfig.json diff --git a/contracts/src/bridge/frontend/vercel.json b/tools/bridge-frontend/vercel.json similarity index 100% rename from contracts/src/bridge/frontend/vercel.json rename to tools/bridge-frontend/vercel.json From d998caf8842c681d3656de3be4cc6d3acae26be9 Mon Sep 17 00:00:00 2001 From: Jennifer Echenim Date: Wed, 21 Aug 2024 15:56:59 +0400 Subject: [PATCH 2/3] update Dockerfile and workflow path for bridge frontend --- .github/workflows/manual-deploy-ten-bridge.yml | 2 +- tools/bridge-frontend/Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/manual-deploy-ten-bridge.yml b/.github/workflows/manual-deploy-ten-bridge.yml index e5ab7feb69..14b51c7529 100644 --- a/.github/workflows/manual-deploy-ten-bridge.yml +++ b/.github/workflows/manual-deploy-ten-bridge.yml @@ -46,7 +46,7 @@ jobs: - name: Build and Push Docker FE Image run: | - DOCKER_BUILDKIT=1 docker build -t ${{ vars.DOCKER_BUILD_TAG_BRIDGE_FE }} -f ./contracts/src/bridge/frontend/Dockerfile . + DOCKER_BUILDKIT=1 docker build -t ${{ vars.DOCKER_BUILD_TAG_BRIDGE_FE }} -f ./tools/bridge-frontend/Dockerfile . docker push ${{ vars.DOCKER_BUILD_TAG_BRIDGE_FE }} - name: "Deploy FE to Azure Container Instances" diff --git a/tools/bridge-frontend/Dockerfile b/tools/bridge-frontend/Dockerfile index 0b68092cf4..1169ef4d3c 100644 --- a/tools/bridge-frontend/Dockerfile +++ b/tools/bridge-frontend/Dockerfile @@ -2,10 +2,10 @@ FROM node:22-alpine # setup container data structure -RUN mkdir -p /home/obscuro/go-obscuro/contracts/src/bridge -COPY ./contracts/src/bridge/frontend /home/obscuro/go-obscuro/contracts/src/bridge/frontend +RUN mkdir -p /home/obscuro/go-obscuro/tools/bridge +COPY ./tools/bridge-frontend /home/obscuro/go-obscuro/tools/bridge-frontend -WORKDIR /home/obscuro/go-obscuro/contracts/src/bridge/frontend +WORKDIR /home/obscuro/go-obscuro/tools/bridge-frontend # ARG for build-time variable ARG API_HOST From df64a04b1ff98708bb2bc1fc580d454b31022c30 Mon Sep 17 00:00:00 2001 From: Jennifer Echenim Date: Wed, 21 Aug 2024 16:00:50 +0400 Subject: [PATCH 3/3] refactor Dockerfile directory structure --- tools/bridge-frontend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bridge-frontend/Dockerfile b/tools/bridge-frontend/Dockerfile index 1169ef4d3c..6aa25dea99 100644 --- a/tools/bridge-frontend/Dockerfile +++ b/tools/bridge-frontend/Dockerfile @@ -2,7 +2,7 @@ FROM node:22-alpine # setup container data structure -RUN mkdir -p /home/obscuro/go-obscuro/tools/bridge +RUN mkdir -p /home/obscuro/go-obscuro/tools COPY ./tools/bridge-frontend /home/obscuro/go-obscuro/tools/bridge-frontend WORKDIR /home/obscuro/go-obscuro/tools/bridge-frontend