- docker image fixes

Author: baywet

Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine3.15 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
 
 ARG MS_NUGET_URL=https://nuget.pkg.github.com/microsoft/index.json
 ARG MSGRAPH_NUGET_URL=https://nuget.pkg.github.com/microsoftgraph/index.json
@@ -9,21 +9,24 @@ WORKDIR /app
 
 COPY ./src ./msgraph-cli/src
 COPY ./msgraph-cli-core ./msgraph-cli/msgraph-cli-core
-RUN ls -al ./msgraph-cli/src/generated/DeviceManagement/ApplePushNotificationCertificate
 WORKDIR /app/msgraph-cli
 
 RUN dotnet nuget add source ${MS_NUGET_URL} -n ms-gh -u ${NUGET_USER} -p ${NUGET_PASSWORD} --store-password-in-clear-text &&\
     dotnet nuget add source ${MSGRAPH_NUGET_URL} -n msgraph-gh -u ${NUGET_USER} -p ${NUGET_PASSWORD} --store-password-in-clear-text
 
 RUN dotnet publish ./src/msgraph-cli.csproj --configuration Release --no-self-contained -p:PublishSingleFile=false -p:PublishReadyToRun=false
 
-FROM mcr.microsoft.com/dotnet/runtime:6.0-alpine3.15 as runtime
+FROM mcr.microsoft.com/dotnet/runtime:6.0 as runtime
+
 WORKDIR /app
 
-COPY --from=build-env /app/msgraph-cli/src/msgraph-cli/bin/Release/net6.0/publish ./
+COPY --from=build-env /app/msgraph-cli/src/bin/Release/net6.0/${RID}/ ./dist
+RUN echo 'export PATH=$PATH:/app/dist' > /app/.bash_profile
+
+ENV HOME=/app
 
-ENV HOME=/app/home
+# CMD ["bash", "-l"]
+ENTRYPOINT ["/app/dist/mgc"]
 
-ENTRYPOINT ["dotnet", "mgc.dll"]
 LABEL description="# Welcome to the Microsoft Graph CLI  \
 [Source dockerfile](https://github.com/microsoftgraph/msgraph-cli/blob/main/Dockerfile)"

src/Program.cs

@@ -123,7 +123,7 @@ static IHostBuilder CreateHostBuilder(string[] args) =>
 
         static void ConfigureAppConfiguration(IConfigurationBuilder builder) {
             builder.Sources.Clear();
-            builder.AddJsonFile("app-settings.json", optional: false);
+            builder.AddJsonFile(Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "app-settings.json"), optional: false);
             var pathUtil = new PathUtility();
             var authCache = new AuthenticationCacheUtility(pathUtil);
             var dataDir = pathUtil.GetApplicationDataDirectory();