[Bookworm] Optimize Layers for Bookworm images, updated ssh support f…

…orr Powershell 7.4 (#1054) * optimize layers, fx powershell7.4 ssh * Missed saving changes thanks andy --------- Co-authored-by: Cooper Link <cooperlink@microsoft.com>
Azure · Mar 6, 2024 · f925288 · f925288
1 parent 5c4673e
commit f925288
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/host/4/bookworm/java/java21/java21-appservice.Dockerfile b/host/4/bookworm/java/java21/java21-appservice.Dockerfile
@@ -44,12 +44,11 @@ ARG HOST_VERSION
 ARG JAVA_VERSION
 ARG JAVA_HOME
 
+COPY --from=runtime-image [ "/azure-functions-host", "/azure-functions-host" ]
 COPY --from=runtime-image [ "/FuncExtensionBundles", "/FuncExtensionBundles" ]
-COPY install_ca_certificates.sh /opt/startup/
-RUN chmod +x /opt/startup/install_ca_certificates.sh
 COPY sshd_config /etc/ssh/
 COPY start.sh /azure-functions-host/
-COPY --from=runtime-image [ "/azure-functions-host", "/azure-functions-host" ]
+COPY install_ca_certificates.sh /opt/startup/
 COPY --from=runtime-image [ "/workers/java", "/azure-functions-host/workers/java" ]
 
 EXPOSE 2222 80
@@ -73,6 +72,7 @@ RUN apt-get update && \
 RUN apt-get update && \
     apt-get install -y --no-install-recommends openssh-server dialog && \
     echo "root:Docker!" | chpasswd && \
-    chmod +x /azure-functions-host/start.sh
+    chmod +x /azure-functions-host/start.sh && \
+    chmod +x /opt/startup/install_ca_certificates.sh
 
 ENTRYPOINT ["/azure-functions-host/start.sh"]
diff --git a/host/4/bookworm/powershell/powershell74/powershell74-appservice.Dockerfile b/host/4/bookworm/powershell/powershell74/powershell74-appservice.Dockerfile
@@ -50,6 +50,7 @@ COPY install_ca_certificates.sh /opt/startup/
 COPY --from=runtime-image ["/workers/powershell/worker.config.json", "/azure-functions-host/workers/powershell/worker.config.json"]
 COPY --from=runtime-image ["/workers/powershell/7.4", "/azure-functions-host/workers/powershell/7.4"]
 
+EXPOSE 2222 80
 # set runtime env variables
 ENV AzureWebJobsScriptRoot=/home/site/wwwroot \
     HOME=/home \
@@ -67,4 +68,8 @@ RUN chmod +x /azure-functions-host/start.sh && \
 RUN apt-get update && \
     apt-get install -y libc-dev
 
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends openssh-server dialog && \
+    echo "root:Docker!" | chpasswd
+
 CMD [ "/azure-functions-host/start.sh" ]