Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Bookworm] Optimize Layers for Bookworm images, updated ssh support forr Powershell 7.4 #1054

Merged
merged 2 commits into from
Mar 6, 2024
Merged

[Bookworm] Optimize Layers for Bookworm images, updated ssh support forr Powershell 7.4 #1054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c28359
optimize layers, fx powershell7.4 ssh
Feb 29, 2024
d53bada
Missed saving changes thanks andy
Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions host/4/bookworm/java/java21/java21-appservice.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"]
5 changes: 5 additions & 0 deletions host/4/bookworm/powershell/powershell74/powershell74-appservice.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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" ]