Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(docker): add web client and control center services to docker compose setup #4197

Merged
merged 17 commits into from
May 6, 2024
Merged

build(docker): add web client and control center services to docker compose setup #4197

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e9e33d7
Added web client and control center services to docker-compose.yml
prasad89 Mar 26, 2024
f606675
Update server and web URLs in docker-compose.yml
prasad89 Mar 26, 2024
a84bb9e
Fix formatting in docker-compose.yml file
prasad89 Mar 26, 2024
115ba2a
Update Dockerfile to use latest LTS version of Node.js
prasad89 Mar 26, 2024
89fa634
Add environment variables for Hyperswitch configuration
prasad89 Mar 26, 2024
2c62e41
Update environment variables in docker-compose.yml
prasad89 Mar 27, 2024
270db2a
Update URLs in control-center
prasad89 Mar 27, 2024
13ed018
Update URLs in docker-compose.yml and modify CMD in web.Dockerfile
prasad89 Mar 27, 2024
dd1d576
addressed review comments by @lsampras
prasad89 Apr 24, 2024
542b115
Remove unused network configuration in docker-compose.yml
prasad89 Apr 24, 2024
ce5ca87
Update SDK base URL in docker-compose.yml
prasad89 Apr 26, 2024
61573ac
Update URLs and environment variables in docker-compose.yml and web.D…
prasad89 Apr 29, 2024
42c8346
minor changes
prasad89 Apr 29, 2024
3e9a23c
Merge branch 'main' into docker-compose
prasad89 Apr 29, 2024
5b126a0
Merge branch 'main' into docker-compose
prasad89 Apr 30, 2024
e44f2a7
Merge branch 'main' into docker-compose
prasad89 Apr 30, 2024
7a552e5
Updatevenvironment variables in docker-compose.yml
prasad89 Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,10 @@ services:
- HYPERSWITCH_SERVER_URL=${HYPERSWITCH_SERVER_URL:-http://hyperswitch-server:8080}
- HYPERSWITCH_CLIENT_URL=${HYPERSWITCH_CLIENT_URL:-http://localhost:9050}
prasad89 marked this conversation as resolved.
Show resolved Hide resolved
- SELF_SERVER_URL=${SELF_SERVER_URL:-http://localhost:5252}
depends_on:
hyperswitch-server:
condition: service_started
- SDK_ENV=${SDK_ENV:-local}
- ENV_SDK_URL=${ENV_SDK_URL:-http://localhost:9050/HyperLoader.js}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This won't have the HyperLoader.js at the end this is supposed to be the base url only

- ENV_BACKEND_URL=${ENV_BACKEND_URL:-http://localhost:8080}
- ENV_LOGGING_URL=${ENV_LOGGING_URL:-http://localhost:3100}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe you picked this up from the issue that was mentioned in the fix, but that change hasn't been merged to main branch yet,

either use the older SDK variable keys or pull that branch instead of main in your dockerfile

labels:
logs: "promtail"

Expand All @@ -151,11 +152,6 @@ services:
environment:
- apiBaseUrl=http://localhost:8080
- sdkBaseUrl=http://localhost:9050/HyperLoader.js
depends_on:
hyperswitch-server:
condition: service_started
hyperswitch-web:
condition: service_started
labels:
logs: "promtail"

Expand Down
4 changes: 2 additions & 2 deletions docker/web.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ RUN npm install concurrently -g

WORKDIR /hyperswitch-web

RUN git clone https://github.com/juspay/hyperswitch-web .
RUN git clone https://github.com/juspay/hyperswitch-web . --depth 1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ordering here seems incorrect


RUN npm install

EXPOSE 9050
EXPOSE 5252
EXPOSE 9060

CMD concurrently "npm run re:build" "npm run start" "npm run start:playground"
CMD concurrently "npm run re:build && npm run start" "npm run start:playground"
Loading