Skip to content

Commit

Permalink
Merge branch 'main' into nicoletan/dfc-475-create-endpoint-to-store-e…
Browse files Browse the repository at this point in the history
…mail
  • Loading branch information
pierregee authored Mar 18, 2024
2 parents fefc901 + 3029924 commit 54b4fd8
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 30 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release-apps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ on:
branches: [main]
pull_request:
branches: [main]
workflow_dispatch:
branches: [main]

permissions:
id-token: write
Expand Down Expand Up @@ -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
Expand All @@ -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
24 changes: 0 additions & 24 deletions Dockerfile

This file was deleted.

1 change: 0 additions & 1 deletion apps/server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Dockerfile used to build an image for the defichain-wallet-api
FROM node:18.17.0-alpine3.17

WORKDIR /app
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"packageManager": "[email protected]",
"dependencies": {
"@waveshq/standard-prettier": "^3.0.1",
"turbo": "^1.11.3"
"turbo": "^1.11.3",
"semver": "^7.5.4"
}
}
3 changes: 3 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
packages:
- "packages/*"
- "apps/*"
- "docs"

0 comments on commit 54b4fd8

Please sign in to comment.