Update with fixed docker image

shawnwildermuth · Nov 13, 2020 · 6eef0b0 · 6eef0b0
1 parent a857453
commit 6eef0b0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/WilderBlog/Dockerfile b/src/WilderBlog/Dockerfile
@@ -2,9 +2,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:5.0-buster-slim AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
-RUN curl -sL https://deb.nodesource.com/setup_10.x |  bash -
-RUN apt-get install -y nodejs
+FROM wilderminds/net5-npm:15.0 AS build
 WORKDIR /src
 COPY ["WilderBlog/WilderBlog.csproj", "WilderBlog/"]
 COPY ["WilderBlog.Data/WilderBlog.Data.csproj", "WilderBlog.Data/"]

diff --git a/src/WilderBlog/WilderBlog.csproj b/src/WilderBlog/WilderBlog.csproj
@@ -66,6 +66,8 @@
     <Exec Command="node node_modules/gulp/bin/gulp.js clean" />
     <Exec Command="node node_modules/gulp/bin/gulp.js minify" />
     <Exec Command="node node_modules/gulp/bin/gulp.js scripts" />
+    <Exec Command="npm install"
+          WorkingDirectory="client/" />
     <Exec Command="npm run build" WorkingDirectory="client/" />
   </Target>
 

diff --git a/src/WilderBlog/client/package.json b/src/WilderBlog/client/package.json
@@ -17,6 +17,7 @@
     "vuex": "^4.0.0-0"
   },
   "devDependencies": {
+    "@vue/cli": "4.5.8",
     "@vue/cli-plugin-babel": "~4.5.0",
     "@vue/cli-plugin-typescript": "~4.5.0",
     "@vue/cli-plugin-vuex": "~4.5.0",