diff --git a/Dockerfile.client b/Dockerfile.client index 214e881..d5a524e 100644 --- a/Dockerfile.client +++ b/Dockerfile.client @@ -2,7 +2,7 @@ FROM node:18 as build-step WORKDIR /frontend ENV PATH /frontend/node_modules/.bin:$PATH -COPY frontend/package.json frontend/yarn.lock frontend/tsconfig.json ./ +COPY frontend/package.json frontend/yarn.lock frontend/tsconfig.json frontend/.env ./ COPY frontend/src ./src COPY frontend/public ./public RUN yarn install diff --git a/docker-compose.yml b/docker-compose.yml index 6748159..86082d7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,5 +12,3 @@ services: image: codex-frontend-client ports: - "3000:80" - environment: - - CODEX_URL=http://loiujhaiuhailuhost:8080 diff --git a/frontend/.env b/frontend/.env new file mode 100644 index 0000000..553b76f --- /dev/null +++ b/frontend/.env @@ -0,0 +1 @@ +REACT_APP_CODEX_URL=http://localhost:8080 diff --git a/frontend/package.json b/frontend/package.json index 3caa8a8..edef1f7 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -18,6 +18,7 @@ "@types/react": "^18.2.25", "@types/react-dom": "^18.2.11", "axios": "^1.5.1", + "dotenv": "^16.3.1", "form-data": "^4.0.0", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/frontend/src/store.ts b/frontend/src/store.ts index e4f17e1..5bacbf8 100644 --- a/frontend/src/store.ts +++ b/frontend/src/store.ts @@ -28,7 +28,7 @@ export const useDexyStore = create()( ftdCid: "", setFtdCid: (cid) => set({ ftdCid: cid }), nodeInfo: { - baseUrl: process.env.CODEX_URL || "http://localhost:8080", + baseUrl: process.env.REACT_APP_CODEX_URL || "http://localhost:8080", nodeToConnectTo: null, id: null, // ip: null, diff --git a/frontend/yarn.lock b/frontend/yarn.lock index f978b9d..c7af103 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -4304,6 +4304,11 @@ dotenv@^10.0.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81" integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q== +dotenv@^16.3.1: + version "16.3.1" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e" + integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ== + duplexer@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"