selfhosted
/
Reactive-Resume
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'main' into dependabot/npm_and_yarn/client/types/node-17.0.23

This commit is contained in:
Amruth Pillai 2022-03-24 08:14:59 +01:00 committed by GitHub
parent 2e9e14dc72 a03a50b7c6
commit 87c60729b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 39 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
.github/dependabot.yml vendored
View File

@ -1,69 +1,47 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates
version: 2
updates:
- package-ecosystem: "docker" # See documentation for possible values
directory: "/server" # Location of package manifests
- package-ecosystem: "docker"
directory: "/server"
schedule:
interval: "daily"
assignees:
- "AmruthPillai"
interval: "weekly"
- package-ecosystem: "docker" # See documentation for possible values
directory: "/client" # Location of package manifests
- package-ecosystem: "docker"
directory: "/client"
schedule:
interval: "daily"
assignees:
- "AmruthPillai"
interval: "weekly"
- package-ecosystem: "npm" # See documentation for possible values
directory: "/" # Location of package manifests
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "daily"
assignees:
- "AmruthPillai"
interval: "weekly"
- package-ecosystem: "npm" # See documentation for possible values
directory: "/client" # Location of package manifests
- package-ecosystem: "npm"
directory: "/client"
schedule:
interval: "daily"
assignees:
- "AmruthPillai"
interval: "weekly"
- package-ecosystem: "npm" # See documentation for possible values
directory: "/server" # Location of package manifests
- package-ecosystem: "npm"
directory: "/server"
schedule:
interval: "daily"
assignees:
- "AmruthPillai"
interval: "weekly"
- package-ecosystem: "npm" # See documentation for possible values
directory: "/schema" # Location of package manifests
- package-ecosystem: "npm"
directory: "/schema"
schedule:
interval: "daily"
assignees:
- "AmruthPillai"
interval: "weekly"
- package-ecosystem: "npm" # See documentation for possible values
directory: "/docs" # Location of package manifests
- package-ecosystem: "npm"
directory: "/docs"
schedule:
interval: "daily"
assignees:
- "AmruthPillai"
interval: "weekly"
- package-ecosystem: "gradle" # See documentation for possible values
directory: "/app" # Location of package manifests
- package-ecosystem: "gradle"
directory: "/app"
schedule:
interval: "daily"
assignees:
- "AmruthPillai"
interval: "weekly"
- package-ecosystem: "github-actions"
directory: "/" # Location of package manifests
directory: "/"
schedule:
interval: "daily"
assignees:
- "AmruthPillai"
interval: "weekly"

2
.github/workflows/digitalocean-deploy.yml vendored
View File

@ -13,7 +13,7 @@ jobs:
steps:
- name: Install DigitalOcean CLI
uses: digitalocean/action-doctl@v2.1.0
uses: digitalocean/action-doctl@v2.1.1
with:
token: ${{ secrets.DIGITALOCEAN_TOKEN }}

8
.github/workflows/docker-build-push.yml vendored
View File

@ -24,7 +24,7 @@ jobs:
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Build and Push Client Image
uses: docker/build-push-action@v2.9.0
uses: docker/build-push-action@v2.10.0
with:
context: .
push: true
@ -52,7 +52,7 @@ jobs:
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Build and Push Server Image
uses: docker/build-push-action@v2.9.0
uses: docker/build-push-action@v2.10.0
with:
context: .
push: true
@ -81,7 +81,7 @@ jobs:
password: ${{ secrets.GH_TOKEN }}
- name: Build and Push Client Image
uses: docker/build-push-action@v2.9.0
uses: docker/build-push-action@v2.10.0
with:
context: .
push: true
@ -110,7 +110,7 @@ jobs:
password: ${{ secrets.GH_TOKEN }}
- name: Build and Push Server Image
uses: docker/build-push-action@v2.9.0
uses: docker/build-push-action@v2.10.0
with:
context: .
push: true

6
client/Dockerfile
View File

@ -1,4 +1,4 @@
FROM node:16-alpine as dependencies
FROM node:17-alpine as dependencies
RUN apk add --no-cache curl g++ make python3 \
&& curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm
@ -11,7 +11,7 @@ COPY ./client/package.json ./client/package.json
RUN pnpm install --frozen-lockfile
FROM node:16-alpine as builder
FROM node:17-alpine as builder
RUN apk add --no-cache curl g++ make python3 \
&& curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm
@ -27,7 +27,7 @@ COPY --from=dependencies /app/client/node_modules ./client/node_modules
RUN pnpm run build:schema
RUN pnpm run build:client
FROM node:16-alpine as production
FROM node:17-alpine as production
WORKDIR /app

2
client/package.json
View File

@ -59,7 +59,7 @@
"@types/downloadjs": "^1.4.3",
"@types/lodash": "^4.14.180",
"@types/node": "17.0.23",
"@types/react": "17.0.40",
"@types/react": "17.0.42",
"@types/react-beautiful-dnd": "^13.1.2",
"@types/react-redux": "^7.1.23",
"@types/tailwindcss": "^3.0.9",

4
server/Dockerfile
View File

@ -1,4 +1,4 @@
FROM node:16-alpine as dependencies
FROM node:17-alpine as dependencies
RUN apk add --no-cache g++ curl make python3 \
&& curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm
@ -11,7 +11,7 @@ COPY ./server/package.json ./server/package.json
RUN pnpm install --frozen-lockfile
FROM node:16-alpine as builder
FROM node:17-alpine as builder
RUN apk add --no-cache g++ curl make python3 \
&& curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm

2
server/package.json
View File

@ -31,7 +31,7 @@
"cookie-parser": "^1.4.6",
"csvtojson": "^2.0.10",
"dayjs": "^1.11.0",
"googleapis": "^97.0.0",
"googleapis": "^98.0.0",
"joi": "^17.6.0",
"lodash": "^4.17.21",
"multer": "^1.4.4",