Skip to content

Commit

Permalink
Merge branch 'master' into renovate/docker-build-push-action-5.x
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Sep 30, 2023
2 parents 5f9dde3 + 545894f commit 3c480da
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ jobs:

- name: 'Set up Docker BuildX'
if: ${{ github.event_name == 'push' }}
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: 'Login to Dockerhub registry'
if: ${{ github.event_name == 'push' }}
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: devoxa
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Builder ##

FROM node:18.17-alpine AS builder
FROM node:18.18-alpine AS builder
WORKDIR /application

# Install the NPM dependencies
Expand All @@ -16,7 +16,7 @@ RUN yarn install --production --frozen-lockfile

## Runner ##

FROM node:18.17-alpine AS runner
FROM node:18.18-alpine AS runner
WORKDIR /application
ENV NODE_ENV production

Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
"devDependencies": {
"@devoxa/eslint-config": "3.0.11",
"@devoxa/prettier-config": "2.0.2",
"@types/node": "18.17.15",
"@types/s3rver": "3.7.0",
"eslint": "8.49.0",
"@types/node": "18.18.1",
"@types/s3rver": "3.7.1",
"eslint": "8.50.0",
"prettier": "3.0.3",
"ts-node-dev": "2.0.0",
"typescript": "5.2.2"
},
"volta": {
"node": "18.17.1"
"node": "18.18.0"
}
}
34 changes: 17 additions & 17 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@
minimatch "^3.1.2"
strip-json-comments "^3.1.1"

"@eslint/js@8.49.0":
version "8.49.0"
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.49.0.tgz#86f79756004a97fa4df866835093f1df3d03c333"
integrity sha512-1S8uAY/MTJqVx0SC4epBq+N2yhuwtNwLbJYNZyhL2pO1ZVKn5HFXav5T41Ryzy9K9V7ZId2JB2oy/W4aCd9/2w==
"@eslint/js@8.50.0":
version "8.50.0"
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.50.0.tgz#9e93b850f0f3fa35f5fa59adfd03adae8488e484"
integrity sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==

"@humanwhocodes/config-array@^0.11.11":
version "0.11.11"
Expand Down Expand Up @@ -176,15 +176,15 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.8.tgz#b5dda19adaa473a9bf0ab5cbd8f30ec7d43f5c85"
integrity sha512-0mHckf6D2DiIAzh8fM8f3HQCvMKDpK94YQ0DSVkfWTG9BZleYIWudw9cJxX8oCk9bM+vAkDyujDV6dmKHbvQpg==

"@types/node@18.17.15":
version "18.17.15"
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.17.15.tgz#31301a273b9ca7d568fe6d1c35ae52e0fb3f8d6a"
integrity sha512-2yrWpBk32tvV/JAd3HNHWuZn/VDN1P+72hWirHnvsvTGSqbANi+kSeuQR9yAHnbvaBvHDsoTdXV0Fe+iRtHLKA==
"@types/node@18.18.1":
version "18.18.1"
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.18.1.tgz#80b22f3df719f15c9736207980e95f35d01ec1aa"
integrity sha512-3G42sxmm0fF2+Vtb9TJQpnjmP+uKlWvFa8KoEGquh4gqRmoUG/N0ufuhikw6HEsdG2G2oIKhog1GCTfz9v5NdQ==

"@types/[email protected].0":
version "3.7.0"
resolved "https://registry.yarnpkg.com/@types/s3rver/-/s3rver-3.7.0.tgz#e7444d7473d99d1e731d017c70ec8c6a77be2a90"
integrity sha512-EoVqpsY0Bfr98l0SzQWn5ZoyAFVr26V/k7hTePOMrOmcMl96/z5RvhzQgQ/2K+GTGutHFmvMfnnMuDLoPG9BCQ==
"@types/[email protected].1":
version "3.7.1"
resolved "https://registry.yarnpkg.com/@types/s3rver/-/s3rver-3.7.1.tgz#7586f7784874dd57edab93e05ee208d2f5fe31bd"
integrity sha512-3y8rTuvCzWgFHYw9xoQ/9UsZgg6sbJjmPylUuFifhVVCEFywBrNzR/9HVMT3NeyKr+aRG89bIwdWviBLg5x2EQ==
dependencies:
"@types/node" "*"

Expand Down Expand Up @@ -872,15 +872,15 @@ eslint-visitor-keys@^3.4.3:
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==

eslint@8.49.0:
version "8.49.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.49.0.tgz#09d80a89bdb4edee2efcf6964623af1054bf6d42"
integrity sha512-jw03ENfm6VJI0jA9U+8H5zfl5b+FvuU3YYvZRdZHOlU2ggJkxrlkJH4HcDrZpj6YwD8kuYqvQM8LyesoazrSOQ==
eslint@8.50.0:
version "8.50.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.50.0.tgz#2ae6015fee0240fcd3f83e1e25df0287f487d6b2"
integrity sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==
dependencies:
"@eslint-community/eslint-utils" "^4.2.0"
"@eslint-community/regexpp" "^4.6.1"
"@eslint/eslintrc" "^2.1.2"
"@eslint/js" "8.49.0"
"@eslint/js" "8.50.0"
"@humanwhocodes/config-array" "^0.11.11"
"@humanwhocodes/module-importer" "^1.0.1"
"@nodelib/fs.walk" "^1.2.8"
Expand Down

0 comments on commit 3c480da

Please sign in to comment.