Skip to content

Commit

Permalink
Merge pull request #19 from UKCloud/fix-build-with-updated-dependencies
Browse files Browse the repository at this point in the history
Fix build with updated dependencies
  • Loading branch information
bensaunders authored Jul 5, 2021
2 parents 82d29f9 + a957b41 commit b1dcee1
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 24 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ COPY tsconfig.json webpack.config.js /app/
COPY src /app/src
RUN npx webpack --mode production

FROM rust:1.41 AS server-compiler
FROM rust:1.52 AS server-compiler
WORKDIR /app/server
RUN mkdir /app/dist && touch --date "1 Jan 1970" /app/dist/index.html /app/dist/main.js
COPY server /app/server
Expand Down
51 changes: 29 additions & 22 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"dependencies": {
"@ccouzens/ukcloud-portal-api": "file:generated/portal-api/",
"@ccouzens/vcloud-rest": "file:generated/vcloud-rest/",
"axios": "^0.19.2"
"axios": "^0.21.1"
},
"devDependencies": {
"@openapitools/openapi-generator-cli": "^1.0.10-4.3.1",
Expand Down

0 comments on commit b1dcee1

Please sign in to comment.