From 3255c5dd406cd78d6f786c68c1ebee9a7fc10a4e Mon Sep 17 00:00:00 2001 From: chloe <44501120+chloezxyy@users.noreply.github.com> Date: Mon, 18 Mar 2024 13:20:18 +0800 Subject: [PATCH 1/6] update pnpm-lock.yaml --- pnpm-lock.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 557b2682..47864312 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -166,6 +166,9 @@ importers: dotenv: specifier: ^16.3.1 version: 16.4.1 + ethers: + specifier: ^6.4.0 + version: 6.11.1 hardhat: specifier: ^2.19.4 version: 2.19.4(ts-node@10.9.2)(typescript@5.3.3) From 50bdea6ed3d75e9b412ee3f2cab195333e2f1dd4 Mon Sep 17 00:00:00 2001 From: chloe <44501120+chloezxyy@users.noreply.github.com> Date: Mon, 18 Mar 2024 17:14:06 +0800 Subject: [PATCH 2/6] chore(ops): manual release tag to ecr --- .github/workflows/release-apps.yml | 4 ++-- Dockerfile | 2 +- pnpm-workspace.yaml | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-apps.yml b/.github/workflows/release-apps.yml index 75933699..603cac1e 100644 --- a/.github/workflows/release-apps.yml +++ b/.github/workflows/release-apps.yml @@ -7,8 +7,6 @@ on: branches: [main] pull_request: branches: [main] - workflow_dispatch: - branches: [main] permissions: id-token: write @@ -40,6 +38,8 @@ jobs: - run: pnpm install --frozen-lockfile +# - run: npm install semver + - uses: aws-actions/configure-aws-credentials@50ac8dd1e1b10d09dac7b8727528b91bed831ac0 # v3.0.2 with: aws-region: ap-southeast-1 diff --git a/Dockerfile b/Dockerfile index 2f6d17e5..70faa0b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN npm install -g pnpm COPY pnpm-lock.yaml ./ COPY package.json ./ -COPY . . +COPY apps ./apps EXPOSE 5741 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 3b88e350..0e5a0737 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,4 +1,3 @@ packages: - "packages/*" - "apps/*" - - "docs" From 7bb9036864d64b9b4d0b30e9f79741b82ad9ee70 Mon Sep 17 00:00:00 2001 From: chloe <44501120+chloezxyy@users.noreply.github.com> Date: Mon, 18 Mar 2024 17:19:45 +0800 Subject: [PATCH 3/6] chore(ops): update docker file --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 70faa0b6..46f2fd7c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,8 +12,6 @@ RUN npm install -g pnpm COPY pnpm-lock.yaml ./ COPY package.json ./ -COPY apps ./apps - EXPOSE 5741 RUN pnpm fetch From 7f1ac523e897c2bbdbea3ec21e0f532375efece5 Mon Sep 17 00:00:00 2001 From: chloe <44501120+chloezxyy@users.noreply.github.com> Date: Mon, 18 Mar 2024 17:26:07 +0800 Subject: [PATCH 4/6] chore(ops): remove docker file from root --- Dockerfile | 22 ---------------------- apps/server/Dockerfile | 1 - 2 files changed, 23 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 46f2fd7c..00000000 --- a/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -# Dockerfile used to build an image for the defichain-wallet-api -FROM node:18.17.0-alpine3.17 - -WORKDIR /app - -ENV PUPPETEER_SKIP_DOWNLOAD=false -ENV CYPRESS_INSTALL_BINARY=0 - -# Install pnpm -RUN npm install -g pnpm - -COPY pnpm-lock.yaml ./ -COPY package.json ./ - -EXPOSE 5741 - -RUN pnpm fetch - -RUN pnpm install -r --offline -RUN pnpm build - -CMD node dist/main.js diff --git a/apps/server/Dockerfile b/apps/server/Dockerfile index 2f6d17e5..d5109261 100644 --- a/apps/server/Dockerfile +++ b/apps/server/Dockerfile @@ -1,4 +1,3 @@ -# Dockerfile used to build an image for the defichain-wallet-api FROM node:18.17.0-alpine3.17 WORKDIR /app From 3265161431973eb27d243ccd9c85aa2a12954ee7 Mon Sep 17 00:00:00 2001 From: chloe <44501120+chloezxyy@users.noreply.github.com> Date: Mon, 18 Mar 2024 17:28:13 +0800 Subject: [PATCH 5/6] chore(ops): update docker file path --- .github/workflows/release-apps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-apps.yml b/.github/workflows/release-apps.yml index 603cac1e..316358b1 100644 --- a/.github/workflows/release-apps.yml +++ b/.github/workflows/release-apps.yml @@ -64,5 +64,5 @@ jobs: ECR_REGISTRY: ${{ matrix.acc }}.dkr.ecr.ap-southeast-1.amazonaws.com IMAGE_TAG: marblefi-ops:${{ steps.ecr-tags.outputs.result }} run: | - docker build --file Dockerfile -t $ECR_REGISTRY/$IMAGE_TAG . + docker build --file apps/server/Dockerfile -t $ECR_REGISTRY/$IMAGE_TAG . docker push $ECR_REGISTRY/$IMAGE_TAG From 23b2a607f2b42a18d51693de0d8976442c042aa8 Mon Sep 17 00:00:00 2001 From: chloe <44501120+chloezxyy@users.noreply.github.com> Date: Mon, 18 Mar 2024 17:49:21 +0800 Subject: [PATCH 6/6] chore(ops): import semver lib for ecr image --- package.json | 3 ++- pnpm-lock.yaml | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index dbc47e3a..24a32c4d 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "packageManager": "pnpm@8.6.12", "dependencies": { "@waveshq/standard-prettier": "^3.0.1", - "turbo": "^1.11.3" + "turbo": "^1.11.3", + "semver": "^7.5.4" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 47864312..e1af0339 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,6 +11,9 @@ importers: '@waveshq/standard-prettier': specifier: ^3.0.1 version: 3.0.1(@typescript-eslint/eslint-plugin@6.21.0)(@typescript-eslint/parser@6.21.0)(eslint-plugin-import@2.29.1)(eslint-plugin-jsx-a11y@6.8.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.33.2) + semver: + specifier: ^7.5.4 + version: 7.5.4 turbo: specifier: ^1.11.3 version: 1.11.3