diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 05250c14..b842b02d 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,8 +1,11 @@ +FROM mcr.microsoft.com/dotnet/aspnet:6.0-bookworm-slim as dotnet-lts-runtime +FROM docker.io/library/mono as mono + # https://hub.docker.com/_/microsoft-dotnet-sdk/ FROM mcr.microsoft.com/dotnet/sdk:8.0 # install ASP.NET Core 6.0 Runtime -COPY --from=mcr.microsoft.com/dotnet/aspnet:6.0-bookworm-slim /usr/share/dotnet /usr/share/dotnet +COPY --from=dotnet-lts-runtime /usr/share/dotnet /usr/share/dotnet # install msbuild for Mono # https://hub.docker.com/_/mono/ diff --git a/.devcontainer/keycloak/Dockerfile b/.devcontainer/keycloak/Dockerfile index b446ae00..19c01acc 100644 --- a/.devcontainer/keycloak/Dockerfile +++ b/.devcontainer/keycloak/Dockerfile @@ -4,7 +4,7 @@ ARG KEYCLOAK_VERSION=25.0.4 FROM alpine as downloader ARG KEYCLOAK_VERSION RUN set -eux; \ - apk add curl; \ + apk add --no-cache curl; \ # https://github.com/jacekkow/keycloak-protocol-cas curl -Lo /tmp/keycloak-protocol-cas.jar https://github.com/jacekkow/keycloak-protocol-cas/releases/download/${KEYCLOAK_VERSION}/keycloak-protocol-cas-${KEYCLOAK_VERSION}.jar; diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh index d0ca4539..de6d76f0 100755 --- a/.devcontainer/setup.sh +++ b/.devcontainer/setup.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # https://learn.microsoft.com/aspnet/core/security/docker-compose-https#macos-or-linux -if [ -f "/https/aspnetapp.pem" ] && [ -f "/https/aspnetapp.key" ]; then +if [[ -f "/https/aspnetapp.pem" ]] && [[ -f "/https/aspnetapp.key" ]]; then cat >> /home/vscode/.bashrc <