Skip to content

Commit

Permalink
⚡ fix (#34)
Browse files Browse the repository at this point in the history
  • Loading branch information
diegoluisi authored Mar 20, 2023
1 parent 4ff6728 commit 17a4531
Show file tree
Hide file tree
Showing 9 changed files with 872 additions and 770 deletions.
4 changes: 4 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.git
app/packages/*/node_modules
app/packages/*/dist
app/dist-types
7 changes: 5 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
# this layer is only for development
FROM node:16 as base
RUN apt update && apt upgrade -y
RUN apt update && apt upgrade -y && npm i -g npm yarn --force

# dev layer include git cli
FROM base as dev
RUN apt install git -y

# build layer responsible to build app
FROM dev as build
WORKDIR /app
COPY app/ .
RUN yarn install && yarn tsc && yarn build
RUN yarn install --frozen-lockfile && yarn tsc && yarn build

# prd layer install only production stuff
FROM dev as prd
WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion app/backstage.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.11.1"
"version": "1.12.0"
}
4 changes: 2 additions & 2 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
]
},
"devDependencies": {
"@backstage/cli": "^0.22.3",
"@backstage/cli": "^0.22.4",
"@spotify/prettier-config": "^12.0.0",
"concurrently": "^6.0.0",
"lerna": "^4.0.0",
Expand All @@ -52,6 +52,6 @@
]
},
"dependencies": {
"@backstage/plugin-sonarqube": "^0.6.4"
"@backstage/plugin-sonarqube": "^0.6.5"
}
}
58 changes: 29 additions & 29 deletions app/packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,34 @@
"role": "frontend"
},
"dependencies": {
"@backstage/app-defaults": "^1.2.0",
"@backstage/catalog-model": "^1.2.0",
"@backstage/cli": "^0.22.3",
"@backstage/core-app-api": "^1.5.0",
"@backstage/core-components": "^0.12.4",
"@backstage/core-plugin-api": "^1.4.0",
"@backstage/integration-react": "^1.1.10",
"@backstage/plugin-api-docs": "^0.9.0",
"@backstage/plugin-catalog": "^1.8.0",
"@backstage/plugin-catalog-common": "^1.0.11",
"@backstage/plugin-catalog-graph": "^0.2.27",
"@backstage/plugin-catalog-import": "^0.9.5",
"@backstage/plugin-catalog-react": "^1.3.0",
"@backstage/plugin-github-actions": "^0.5.15",
"@backstage/plugin-kubernetes": "^0.7.8",
"@backstage/plugin-org": "^0.6.5",
"@backstage/plugin-permission-react": "^0.4.10",
"@backstage/plugin-scaffolder": "^1.11.0",
"@backstage/plugin-search": "^1.1.0",
"@backstage/plugin-search-react": "^1.5.0",
"@backstage/plugin-sonarqube": "^0.6.4",
"@backstage/plugin-tech-radar": "^0.6.1",
"@backstage/plugin-techdocs": "^1.5.0",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.0.10",
"@backstage/plugin-techdocs-react": "^1.1.3",
"@backstage/plugin-todo": "^0.2.17",
"@backstage/plugin-user-settings": "^0.7.0",
"@backstage/theme": "^0.2.17",
"@backstage/app-defaults": "^1.2.1",
"@backstage/catalog-model": "^1.2.1",
"@backstage/cli": "^0.22.4",
"@backstage/core-app-api": "^1.6.0",
"@backstage/core-components": "^0.12.5",
"@backstage/core-plugin-api": "^1.5.0",
"@backstage/integration-react": "^1.1.11",
"@backstage/plugin-api-docs": "^0.9.1",
"@backstage/plugin-catalog": "^1.9.0",
"@backstage/plugin-catalog-common": "^1.0.12",
"@backstage/plugin-catalog-graph": "^0.2.28",
"@backstage/plugin-catalog-import": "^0.9.6",
"@backstage/plugin-catalog-react": "^1.4.0",
"@backstage/plugin-github-actions": "^0.5.16",
"@backstage/plugin-kubernetes": "^0.7.9",
"@backstage/plugin-org": "^0.6.6",
"@backstage/plugin-permission-react": "^0.4.11",
"@backstage/plugin-scaffolder": "^1.12.0",
"@backstage/plugin-search": "^1.1.1",
"@backstage/plugin-search-react": "^1.5.1",
"@backstage/plugin-sonarqube": "^0.6.5",
"@backstage/plugin-tech-radar": "^0.6.2",
"@backstage/plugin-techdocs": "^1.6.0",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.0.11",
"@backstage/plugin-techdocs-react": "^1.1.4",
"@backstage/plugin-todo": "^0.2.18",
"@backstage/plugin-user-settings": "^0.7.1",
"@backstage/theme": "^0.2.18",
"@k-phoen/backstage-plugin-grafana": "^0.1.17",
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
Expand All @@ -52,7 +52,7 @@
"react-use": "^15.3.3"
},
"devDependencies": {
"@backstage/test-utils": "^1.2.5",
"@backstage/test-utils": "^1.2.6",
"@testing-library/jest-dom": "^5.10.1",
"@testing-library/react": "^12.1.3",
"@testing-library/user-event": "^12.0.7",
Expand Down
44 changes: 22 additions & 22 deletions app/packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,27 @@
"build-image": "docker build ../.. -f Dockerfile --tag backstage"
},
"dependencies": {
"@backstage/backend-common": "^0.18.2",
"@backstage/backend-tasks": "^0.4.3",
"@backstage/catalog-client": "^1.3.1",
"@backstage/catalog-model": "^1.2.0",
"@backstage/config": "^1.0.6",
"@backstage/integration": "^1.4.2",
"@backstage/plugin-app-backend": "^0.3.42",
"@backstage/plugin-auth-backend": "^0.18.0",
"@backstage/plugin-catalog-backend": "^1.7.2",
"@backstage/plugin-catalog-backend-module-github": "^0.2.5",
"@backstage/plugin-kubernetes-backend": "^0.9.3",
"@backstage/plugin-permission-common": "^0.7.3",
"@backstage/plugin-permission-node": "^0.7.5",
"@backstage/plugin-proxy-backend": "^0.2.36",
"@backstage/plugin-scaffolder-backend": "^1.11.0",
"@backstage/plugin-search-backend": "^1.2.3",
"@backstage/plugin-search-backend-module-pg": "^0.5.3",
"@backstage/plugin-search-backend-node": "^1.1.3",
"@backstage/plugin-sonarqube-backend": "^0.1.7",
"@backstage/plugin-techdocs-backend": "^1.5.3",
"@backstage/plugin-todo-backend": "^0.1.39",
"@backstage/backend-common": "^0.18.3",
"@backstage/backend-tasks": "^0.5.0",
"@backstage/catalog-client": "^1.4.0",
"@backstage/catalog-model": "^1.2.1",
"@backstage/config": "^1.0.7",
"@backstage/integration": "^1.4.3",
"@backstage/plugin-app-backend": "^0.3.43",
"@backstage/plugin-auth-backend": "^0.18.1",
"@backstage/plugin-catalog-backend": "^1.8.0",
"@backstage/plugin-catalog-backend-module-github": "^0.2.6",
"@backstage/plugin-kubernetes-backend": "^0.9.4",
"@backstage/plugin-permission-common": "^0.7.4",
"@backstage/plugin-permission-node": "^0.7.6",
"@backstage/plugin-proxy-backend": "^0.2.37",
"@backstage/plugin-scaffolder-backend": "^1.12.0",
"@backstage/plugin-search-backend": "^1.2.4",
"@backstage/plugin-search-backend-module-pg": "^0.5.4",
"@backstage/plugin-search-backend-node": "^1.1.4",
"@backstage/plugin-sonarqube-backend": "^0.1.8",
"@backstage/plugin-techdocs-backend": "^1.6.0",
"@backstage/plugin-todo-backend": "^0.1.40",
"app": "link:../app",
"dockerode": "^3.3.1",
"express": "^4.17.1",
Expand All @@ -45,7 +45,7 @@
"winston": "^3.2.1"
},
"devDependencies": {
"@backstage/cli": "^0.22.3",
"@backstage/cli": "^0.22.4",
"@types/dockerode": "^3.3.0",
"@types/express": "^4.17.6",
"@types/express-serve-static-core": "^4.17.5",
Expand Down
Loading

0 comments on commit 17a4531

Please sign in to comment.