diff --git a/.drone.yml b/.drone.yml index 1834909..2304b94 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,25 +3,25 @@ type: docker name: default steps: - - name: build-dotnet - image: alpine - commands: - - echo "Docker build will handle dotnet publish" +- name: build-docker + image: plugins/docker + settings: + registry: 192.168.1.9:3000 + repo: 192.168.1.9:3000/tai/aberwyn/aberwyn + username: + from_secret: gitea_username + password: + from_secret: gitea_token + dockerfile: Aberwyn/Dockerfile + context: . + tags: + - latest + - ${DRONE_COMMIT_SHA:0:7} + cache_from: + - 192.168.1.9:3000/tai/aberwyn/aberwyn:latest + insecure: true + - - name: build-docker - image: plugins/docker - settings: - registry: 192.168.1.9:3000 - repo: 192.168.1.9:3000/tai/aberwyn/aberwyn - username: - from_secret: gitea_username - password: - from_secret: gitea_token - dockerfile: Aberwyn/Dockerfile - context: . - tags: - - latest - insecure: true - name: restart-unraid-container image: appleboy/drone-ssh diff --git a/Aberwyn/Dockerfile b/Aberwyn/Dockerfile index 5872d1e..f04364e 100644 --- a/Aberwyn/Dockerfile +++ b/Aberwyn/Dockerfile @@ -1,9 +1,12 @@ +# Basimage för runtime FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base +# Installera svenska språkinställningar RUN apt-get update && \ apt-get install -y locales && \ locale-gen sv_SE.UTF-8 +# Ställ in svenska som standard ENV LANG=sv_SE.UTF-8 ENV LANGUAGE=sv_SE:sv ENV LC_ALL=sv_SE.UTF-8 @@ -13,18 +16,30 @@ WORKDIR /app EXPOSE 80 EXPOSE 443 +# Byggimage med SDK FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src + +# Kopiera endast .csproj först för att kunna cacha restore COPY ["Aberwyn/Aberwyn.csproj", "Aberwyn/"] WORKDIR /src/Aberwyn + +# Restore beroenden RUN dotnet restore "Aberwyn.csproj" + +# Kopiera övrig kod COPY Aberwyn/. . -RUN dotnet build "Aberwyn.csproj" -c Release -o /app/build +# Bygg utan att köra restore igen +RUN dotnet build "Aberwyn.csproj" -c Release -o /app/build --no-restore + +# Publicera utan att köra restore eller build igen FROM build AS publish -RUN dotnet publish "Aberwyn.csproj" -c Release -o /app/publish +RUN dotnet publish "Aberwyn.csproj" -c Release -o /app/publish --no-restore +# Slutgiltig image baserad på runtime FROM base AS final WORKDIR /app COPY --from=publish /app/publish . + ENTRYPOINT ["dotnet", "Aberwyn.dll"] diff --git a/Aberwyn/wwwroot/css/budget.css b/Aberwyn/wwwroot/css/budget.css index c953e23..a7e39ba 100644 --- a/Aberwyn/wwwroot/css/budget.css +++ b/Aberwyn/wwwroot/css/budget.css @@ -248,7 +248,7 @@ body { } 100% { - color: rgb(80, 0, 0); + color: rgb(160, 0, 0); } } @@ -258,7 +258,7 @@ body { } 100% { - color: rgb(0, 80, 0); + color: rgb(0, 160, 0); } }