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.

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

Feat/server config #41

Merged
merged 77 commits into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
9c35036
feat: add server config from .env and settings.toml
DhananjayPurohit Mar 22, 2024
08c7aba
fix: server config for token server
DhananjayPurohit Mar 22, 2024
77971c9
feat: add docker build for github actions
DhananjayPurohit Mar 26, 2024
6a02b48
feat: add dev branch to yaml
DhananjayPurohit Mar 26, 2024
fb9414e
fix: token server port
DhananjayPurohit Mar 27, 2024
3cfdab5
fix: config for token server port
DhananjayPurohit Mar 27, 2024
8abadd9
[WIP] Add Sealing Key
ssantos21 Mar 31, 2024
6295604
[WIP] Add Sealing Key
ssantos21 Mar 31, 2024
37768f3
[WIP] Add Sealing Key
ssantos21 Apr 2, 2024
a0d06ce
[WIP] Add Sealing Key
ssantos21 Apr 2, 2024
f308e68
[WIP] Add Sealing Key
ssantos21 Apr 2, 2024
d12e2d3
fix: merge conflicts
DhananjayPurohit Apr 3, 2024
1e6577f
fix: comment settings attribute of wallet
DhananjayPurohit Apr 3, 2024
a809302
fix: dockerfile
DhananjayPurohit Apr 4, 2024
2ca8a85
fix: add Rocket.toml to parent folder
DhananjayPurohit Apr 5, 2024
4e362fb
fix: merge conflicts
DhananjayPurohit Apr 5, 2024
4289d2d
fix: remove Rocket.toml from sub folder
DhananjayPurohit Apr 8, 2024
e570b97
fix: add tls-rustls feature to sqlx
DhananjayPurohit Apr 10, 2024
42de8ad
fix: route for endpoint /info
DhananjayPurohit Apr 11, 2024
8bb0c08
feat: add dockerfile for explorer
DhananjayPurohit Apr 15, 2024
0309e5b
fix: copy cmd for explorer dockerfile
DhananjayPurohit Apr 15, 2024
5a9db1c
fix: dockerfile for explorer
DhananjayPurohit Apr 15, 2024
06caa6c
fix: dockerfile copy cmds
DhananjayPurohit Apr 16, 2024
84efc78
fix: path for copy cmd
DhananjayPurohit Apr 16, 2024
2df2e53
fix: dockerfile dir for static files
DhananjayPurohit Apr 16, 2024
c11debe
fix: remove dir creation from explorer dockerfile
DhananjayPurohit Apr 16, 2024
94b5493
fix: change index.html to explorer.html
DhananjayPurohit Apr 16, 2024
6cd8d77
fix: rename explorer.html to index.html
DhananjayPurohit Apr 16, 2024
67ac1e5
feat: configure nginx.conf
DhananjayPurohit Apr 16, 2024
d5728bc
fix: nginx.conf
DhananjayPurohit Apr 16, 2024
732d98b
fix: root path for nginx.conf
DhananjayPurohit Apr 16, 2024
9bddce5
feat: add dockerfile and script for keylist cronjob
DhananjayPurohit Apr 17, 2024
85a155e
Add docker files to the enclave - HW mode
ssantos21 Apr 18, 2024
cd8470b
Add docker files to the enclave - HW mode
ssantos21 Apr 18, 2024
ad63075
Add docker files to the enclave - HW mode
ssantos21 Apr 18, 2024
9db6062
Add docker files to the enclave - HW mode
ssantos21 Apr 18, 2024
dfb55fd
Add docker files to the enclave - HW mode
ssantos21 Apr 18, 2024
77ec346
fix: merge conflicts
DhananjayPurohit Apr 18, 2024
eae1e4d
fix: mercury server build failure
DhananjayPurohit Apr 18, 2024
3dfaab3
fix: file permission in dockerfile for cron
DhananjayPurohit Apr 19, 2024
199cea3
fix: dockerfile for cronjob
DhananjayPurohit Apr 19, 2024
3389303
fix: path in cronjob dockerfile
DhananjayPurohit Apr 19, 2024
baf1924
fix: keylist url
DhananjayPurohit Apr 22, 2024
55db5ea
fix: add sql connection for saving keylist
DhananjayPurohit Apr 22, 2024
36e270e
fix: merge conflicts
DhananjayPurohit Apr 24, 2024
ed2a5a1
fix: merge conflicts
DhananjayPurohit Apr 24, 2024
6052254
fix: merge conflicts with cargo.lock
DhananjayPurohit Apr 24, 2024
f13e4c0
fix: cargo.lock and remove blind_commitment field
DhananjayPurohit Apr 26, 2024
1f947b8
Add address validation and remove standalone rust client
ssantos21 Apr 26, 2024
fa8bf21
fix: merge conflicts
DhananjayPurohit Apr 26, 2024
549fd54
fix: build failure with wasm
DhananjayPurohit Apr 26, 2024
f3198df
fix: merge conflicts
DhananjayPurohit Apr 29, 2024
1ceb561
fix: postgres command
DhananjayPurohit Apr 30, 2024
25b7630
debug: pg command
DhananjayPurohit Apr 30, 2024
c3d551c
fix: bash script
DhananjayPurohit Apr 30, 2024
56482f5
fix: keylist url
DhananjayPurohit May 1, 2024
f6131c8
fix: postgres command
DhananjayPurohit May 1, 2024
1e6e960
fix: postgres command to store json as text
DhananjayPurohit May 1, 2024
cec0572
fix: string handling for json
DhananjayPurohit May 1, 2024
e3c9b26
fix: postgres command connection details
DhananjayPurohit May 1, 2024
93ece38
fix: add env variables to dockerfile
DhananjayPurohit May 2, 2024
4e53fa2
fix: remove env variables
DhananjayPurohit May 2, 2024
7aac172
fix: merge conflicts
DhananjayPurohit May 14, 2024
83b9a0a
Merge branch 'dev' of https://github.com/commerceblock/mercurylayer i…
DhananjayPurohit May 20, 2024
852fafa
fix: token and serverconfig fields
DhananjayPurohit May 20, 2024
49d4e00
Merge branch 'dev' of https://github.com/commerceblock/mercurylayer i…
DhananjayPurohit May 21, 2024
b504675
debug: connection string
DhananjayPurohit May 21, 2024
b83a2e6
debug: token server db connection
DhananjayPurohit May 21, 2024
7c64429
add tls feature to sqlx
tomt1664 May 21, 2024
c06d734
Merge pull request #48 from commerceblock/fix/tls_sqlx
tomt1664 May 22, 2024
5f95990
fix: version for docker images in ci/cd
DhananjayPurohit May 22, 2024
a82240d
Merge branch 'feat/server-config' of https://github.com/commerceblock…
DhananjayPurohit May 22, 2024
128fdec
fix: version for mercury server image
DhananjayPurohit May 22, 2024
5905d67
fix: version commit hash by github actions
DhananjayPurohit May 22, 2024
ddf5640
fix: last commit hash for actions
DhananjayPurohit May 22, 2024
66e9b44
fix: revert commit hashes to smaller string
DhananjayPurohit May 22, 2024
8fd62d5
fix: add position, token, url as env variable
DhananjayPurohit May 22, 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
62 changes: 62 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
name: ci

on:
pull_request:
branches:
- dev
push:
branches:
- main

jobs:
build:
runs-on: ubuntu-latest
steps:
-
name: Checkout
uses: actions/checkout@v4
-
name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: commerceblockx
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
-
name: Get last commit hash
id: get_commit_hash
run: echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
-
name: Build and push for mercury-server
uses: docker/build-push-action@v5
with:
context: .
file: ./server/Dockerfile
push: true
tags: commerceblockx/mercury-server:${{ env.COMMIT_HASH }}
-
name: Build and push for token-server
uses: docker/build-push-action@v5
with:
context: .
file: ./token-server/Dockerfile
push: true
tags: commerceblockx/token-server:${{ env.COMMIT_HASH }}
-
name: Build and push for mercury-explorer
uses: docker/build-push-action@v5
with:
context: .
file: ./explorer/Dockerfile
push: true
tags: commerceblockx/mercury-explorer:${{ env.COMMIT_HASH }}
-
name: Build and push for keylist-cronjob
uses: docker/build-push-action@v5
with:
context: .
file: ./keylistCron/Dockerfile
push: true
tags: commerceblockx/keylist-cronjob:${{ env.COMMIT_HASH }}
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
/target
.vscode
/server/.env
/token-server/.env
.vscode
Loading
Loading