Skip to content

Commit

Permalink
Trying to fix docker run.
Browse files Browse the repository at this point in the history
  • Loading branch information
Layoric committed Apr 21, 2021
1 parent e7ae971 commit b0bad4c
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
8 changes: 6 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
&& rm -rf /var/lib/apt/lists/*

RUN dotnet tool install -g x
RUN dotnet tool install -g app
ENV PATH="${PATH}:/root/.dotnet/tools"
RUN x --version

COPY . .
RUN npm install --include-dev
RUN ./node_modules/typescript/bin/tsc -p .
RUN ./node_modules/.bin/tsc -p .
RUN dotnet restore

WORKDIR /app
Expand All @@ -28,5 +27,10 @@ RUN cp -r /app/typings /out/typings

FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS runtime
WORKDIR /app
RUN chmod 755 /app
COPY --from=build /out ./
#WORKDIR /out
#ENV ASPNETCORE_ENVIRONMENT=Development
#ENV ASPNETCORE_URLS=http://+:80
#EXPOSE 80
ENTRYPOINT ["dotnet", "SharpData.dll"]
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@
"mix-chinook": "xcopy /E /Y dist-mix\\chinook dist",
"mix-northwind": "xcopy /E /Y dist-mix\\northwind dist"
},
"dependencies": {
"vue": "2.6.12",
"vue-router": "3.4.9"
},
"devDependencies": {
"typescript": "^3.8.3"
"typescript": "^4.1.4"
}
}
6 changes: 3 additions & 3 deletions scripts/pack-app.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ mkdir -p dist/custom

cp -r wwwroot/db ./dist/db/

x run _bundle.ss -to /dist
x run _bundle.ss -to dist/

cp -r wwwroot/* dist
cp scripts/deploy/app.settings dist
cp -r wwwroot/ dist/
cp scripts/deploy/app.settings dist/wwwroot/app.settings

cp wwwroot/custom/northwind.js dist-mix/northwind/
cp northwind.sqlite dist-mix/northwindcustom
Expand Down

0 comments on commit b0bad4c

Please sign in to comment.