diff --git a/Dockerfile b/Dockerfile index cbeb00f..a4ab0b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,42 @@ # https://hub.docker.com/_/microsoft-dotnet-core -FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build +#FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build +# FROM alpine AS build +#ARG REPO=mcr.microsoft.com/dotnet/aspnet +#FROM $REPO:5.0-alpine3.12-amd64 -WORKDIR /installer -COPY ./dotnet-install.sh ./dotnet-install.sh -RUN chmod +x dotnet-install.sh -RUN ./dotnet-install.sh --channel 3.1 +#ENV \ +# # Unset ASPNETCORE_URLS from aspnet base image +# ASPNETCORE_URLS= \ +# DOTNET_SDK_VERSION=5.0.100 \ +# # Disable the invariant mode (set in base image) +# DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ +# # Enable correct mode for dotnet watch (only mode supported in a container) +# DOTNET_USE_POLLING_FILE_WATCHER=true \ +# # Skip extraction of XML docs - generally not useful within an image/container - helps performance +# NUGET_XMLDOC_MODE=skip \ +# # PowerShell telemetry for docker image usage +# POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.12## + +#RUN apk add --no-cache \ +# curl \ +# icu-libs \ +# wget \ +# git \ +# bash +# +#WORKDIR /installer +#RUN wget https://dot.net/v1/dotnet-install.sh +##COPY ./dotnet-install.sh ./dotnet-install.sh +#RUN chmod +x dotnet-install.sh +#RUN ./dotnet-install.sh --channel 3.1 +#RUN ./dotnet-install.sh --channel 5.0 +#RUN export PATH=~/.dotnet:$PATH +#RUN export DOTNET_ROOT=~/.dotnet +#RUN export PATH=$PATH:~/.dotnet +##ENV PATH="${PATH}:~/.dotnet" +#ENV PATH="~/.dotnet:${PATH}" + +#RUN which dotnet # # Install .NET CLI dependencies # RUN apt-get update \ # && apt-get install -y --no-install-recommends \ @@ -28,6 +60,30 @@ RUN ./dotnet-install.sh --channel 3.1 # && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \ # # Trigger first run experience by running arbitrary cmd # && dotnet help +FROM ubuntu:groovy as build +RUN export DEBIAN_FRONTEND=noninteractive \ + && apt-get update \ + # Install prerequisites + && apt-get install -y --no-install-recommends \ + wget \ + ca-certificates \ + \ + # Install Microsoft package feed + && wget -q https://packages.microsoft.com/config/ubuntu/20.10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ + && dpkg -i packages-microsoft-prod.deb \ + && rm packages-microsoft-prod.deb \ + \ + # Install .NET + && apt-get update \ + && apt-get install -y --no-install-recommends \ + dotnet-sdk-5.0 \ + dotnet-sdk-3.1 \ + libpng12 \ + \ + # Cleanup + && rm -rf /var/lib/apt/lists/* + + WORKDIR /src # copy csproj and restore as distinct layers diff --git a/Dockerfile2 b/Dockerfile2 new file mode 100644 index 0000000..b3ab8e0 --- /dev/null +++ b/Dockerfile2 @@ -0,0 +1,26 @@ +# https://hub.docker.com/_/microsoft-dotnet-core +FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build +WORKDIR /src + +# copy csproj and restore as distinct layers +COPY Sledgemapper.Api/*.csproj ./Sledgemapper.Api/ +COPY Sledgemapper.Shared/*.csproj ./Sledgemapper.Shared/ + +WORKDIR /src/Sledgemapper.Api +RUN dotnet restore + +WORKDIR /src/Sledgemapper.Shared +RUN dotnet restore + +# copy everything else and build app +WORKDIR /src +COPY Sledgemapper.Api/. ./Sledgemapper.Api/ +COPY Sledgemapper.Shared/. ./Sledgemapper.Shared/ +WORKDIR /src/Sledgemapper.Api +RUN dotnet publish -c release -o /app --no-restore + +# final stage/image +FROM mcr.microsoft.com/dotnet/aspnet:5.0 +WORKDIR /app +COPY --from=build /app ./ +ENTRYPOINT ["dotnet", "Sledgemapper.Api.dll"] diff --git a/Sledgemapper/Sledgemapper.cs b/Sledgemapper/Sledgemapper.cs index ad69905..f5ea365 100644 --- a/Sledgemapper/Sledgemapper.cs +++ b/Sledgemapper/Sledgemapper.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNetCore.SignalR.Client; +using Microsoft.AspNetCore.SignalR.Client; using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Input; @@ -325,15 +325,16 @@ namespace Sledgemapper { return; } - GraphicsDevice.Clear(Color.LightGray); + GraphicsDevice.Clear(Color.DarkGray); var visibleTilesX = GraphicsDevice.Viewport.Width / _state.TileSize + 1; var visibleTilesY = GraphicsDevice.Viewport.Height / _state.TileSize + 1; _spriteBatch.Begin(transformMatrix: Matrix.CreateTranslation(_viewportCenter)); - DrawGrid(visibleTilesX, visibleTilesY); DrawTiles(); + DrawGrid(visibleTilesX, visibleTilesY); + DrawWalls(); DrawOverlays(); @@ -446,7 +447,7 @@ namespace Sledgemapper posX1, posY1, posX2, posY2, - Color.GhostWhite); + Color.Black); } for (var i = -1; i < visibleTilesY + 2; i++) @@ -463,7 +464,7 @@ namespace Sledgemapper _spriteBatch.DrawLine(posX1, posY1, posX2, posY2, - Color.GhostWhite); + Color.Black); }