Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
djdembeck committed Sep 29, 2023
2 parents 55fe1a3 + a38168a commit 29c30c3
Show file tree
Hide file tree
Showing 5 changed files with 706 additions and 684 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
# https://github.com/docker/login-action
- name: Log into registry ${{ env.REGISTRY }}
if: github.event_name != 'pull_request'
uses: docker/login-action@553b6f090f15b58451081ce157ff1929a266131d
uses: docker/login-action@b4bedf8053341df3b5a9f9e0f2cf4e79e27360c6
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
Expand All @@ -50,14 +50,14 @@ jobs:
# https://github.com/docker/metadata-action
- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@0f8c876bafbf5dbce05c36682ec68e9a0274a48a
uses: docker/metadata-action@6dfb6f1404065e66f9af1a56a7d39ad09efaaf9a
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

# Build and push Docker image with Buildx (don't push on PR)
# https://github.com/docker/build-push-action
- name: Build and push Docker image
uses: docker/build-push-action@9311bf5263ae5b36f3ec67aff768790c6e2344ad
uses: docker/build-push-action@4c1b68d83ad20cc1a09620ca477d5bbbb5fa14d0
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ services:
replicas: 15

mongo:
image: mongo:6
image: mongo:7
restart: always
volumes:
- /mnt/docker/mongo/data:/data/db
Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,37 +36,37 @@
"axios": "^1.2.4",
"cheerio": "1.0.0-rc.12",
"domhandler": "5.0.3",
"fastify": "4.21.0",
"fastify": "4.22.2",
"html-to-text": "9.0.5",
"jest-mock-extended": "3.0.5",
"jsrsasign": "^10.8.6",
"lodash": "4.17.21",
"module-alias": "2.2.3",
"moment": "^2.29.4",
"mongodb": "5.7.0",
"mongodb": "5.8.1",
"papr": "14.1.0",
"toad-scheduler": "^3.0.0",
"typescript": "5.1.6",
"typescript": "5.2.2",
"zod": "^3.20.6"
},
"devDependencies": {
"@jest/types": "29.6.1",
"@jest/types": "29.6.3",
"@redocly/cli": "^1.0.2",
"@types/html-to-text": "9.0.1",
"@types/jest": "29.5.3",
"@types/jest": "29.5.4",
"@types/jsrsasign": "10.5.8",
"@types/lodash": "4.14.197",
"@types/node": "18.17.6",
"@typescript-eslint/eslint-plugin": "6.4.1",
"@typescript-eslint/parser": "6.4.1",
"@types/lodash": "4.14.198",
"@types/node": "18.17.14",
"@typescript-eslint/eslint-plugin": "6.6.0",
"@typescript-eslint/parser": "6.6.0",
"concurrently": "8.2.1",
"eslint": "8.47.0",
"eslint": "8.48.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-jest": "27.2.3",
"eslint-plugin-simple-import-sort": "10.0.0",
"jest": "29.6.2",
"jest": "29.6.4",
"nodemon": "3.0.1",
"prettier": "3.0.2",
"prettier": "3.0.3",
"standard-version": "9.5.0",
"ts-jest": "29.1.1",
"ts-node": "10.9.1"
Expand Down
Loading

0 comments on commit 29c30c3

Please sign in to comment.