initial dotnet sdk & runtime images

Makefile

@@ -239,7 +239,12 @@ versioned-images := 		php-8.1-fpm \
 							ruby-3.3 \
 							opensearch-2 \
 							mysql-8.0 \
-							mysql-8.4
+							mysql-8.4 \
+							dotnet-6-sdk \
+							dotnet-6-runtime \
+							dotnet-8-sdk \
+							dotnet-8-runtime
+
 
 # default-versioned-images are images that formerly had no versioning, and are made backwards-compatible.
 # the below versions are the ones that map to the unversioned namespace
@@ -322,6 +327,7 @@ build/ruby-3.1 build/ruby-3.2 build/ruby-3.3: build/commons
 build/opensearch-2: build/commons
 build/mongo-4: build/commons 
 build/mysql-8.0 build/mysql-8.4: build/commons
+build/dotnet-6-sdk build/dotnet-6-runtime build/dotnet-8-sdk build/dotnet-8-runtime: build/commons
 
 #######
 ####### Building Images

helpers/TESTING_base_images_dockercompose.md

@@ -52,6 +52,8 @@ docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep
 docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep ruby-3-1
 docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep ruby-3-2
 docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep ruby-3-3
+docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep dotnet-6
+docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep dotnet-8
 
 # commons should be running Alpine Linux
 docker compose exec -T commons sh -c "cat /etc/os-release" | grep "Alpine Linux"
@@ -272,6 +274,18 @@ docker compose exec -T ruby-3-3 sh -c "ruby -v" | grep "3.3"
 
 # ruby-3-3 should be serving content
 docker compose exec -T commons sh -c "curl ruby-3-3:3000/tmp/" | grep "ruby 3.3"
+
+# dotnet-6 should have .NET 6
+docker compose exec -T dotnet-6 sh -c "dotnet --list-sdks" | grep "6.0"
+
+# dotnet-6 should be serving content
+docker compose exec -T commons sh -c "curl dotnet-6:3000" | grep "6.0"
+
+# dotnet-8 should have .NET 8
+docker compose exec -T dotnet-8 sh -c "dotnet --list-sdks" | grep "8.0"
+
+# dotnet-8 should be serving content
+docker compose exec -T commons sh -c "curl dotnet-8:3000" | grep "8.0"
 ```
 
 Destroy tests

helpers/images-docker-compose.yml

@@ -1,5 +1,3 @@
-version: '2.3'
-
 x-user:
   &default-user
     # The default user under which the containers should run. Change this if you are on linux and run with another user than id `1000`
@@ -229,3 +227,39 @@ services:
     environment:
       - LAGOON_TEST_VAR=all-images
     << : *default-user # uses the defined user from top
+
+  dotnet-6:
+    image: uselagoon/dotnet-6-sdk:latest
+    working_dir: /app
+    environment:
+      - ASPNETCORE_URLS=http://+:3000
+      - DOTNET_USE_POLLING_FILE_WATCHER=1
+    networks:
+      - default
+    labels:
+      lagoon.type: basic
+    ports:
+      - "3000"
+    command: ["sh", "-c", "
+        dotnet new web -n myWebApp -o /app --no-https;
+        dotnet --list-sdks | cut -c1-8 | xargs -I {} sed -i 's/Hello World!/{}/g' /app/Program.cs;
+        dotnet run /app --no-launch-profile
+        "]
+
+  dotnet-8:
+    image: uselagoon/dotnet-8-sdk:latest
+    working_dir: /app
+    environment:
+      - ASPNETCORE_URLS=http://+:3000
+      - DOTNET_USE_POLLING_FILE_WATCHER=1
+    networks:
+      - default
+    labels:
+      lagoon.type: basic
+    ports:
+      - "3000"
+    command: ["sh", "-c", "
+        dotnet new web -n myWebApp -o /app --no-https;
+        dotnet --list-sdks | cut -c1-8 | xargs -I {} sed -i 's/Hello World!/{}/g' /app/Program.cs;
+        dotnet run /app --no-launch-profile
+        "]

helpers/services-docker-compose.yml

@@ -1,5 +1,3 @@
-version: '2.3'
-
 x-user:
   &default-user
     # The default user under which the containers should run. Change this if you are on linux and run with another user than id `1000`
@@ -158,7 +156,7 @@ services:
     labels:
       lando.type: opensearch
     ports:
-      - "9200" # exposes the port 8080 with a random local port, find it with `docker-compose port nginx 8080`
+      - "9200"
     << : *default-user # uses the defined user from top
 
   internal-services-test:
@@ -168,3 +166,37 @@ services:
     environment:
       - LAGOON_TEST_VAR=all-images
     << : *default-user # uses the defined user from top
+
+  dotnet-6:
+    image: testlagoon/dotnet-6-sdk:pr-550
+    working_dir: /app
+    environment:
+      - ASPNETCORE_URLS=http://+:3000
+      - DOTNET_USE_POLLING_FILE_WATCHER=1
+    networks:
+      - default
+    labels:
+      lagoon.type: basic
+    ports:
+      - "3000"
+    command: ["sh", "-c", "
+        dotnet new web -n myWebApp -o /app --no-https;
+        dotnet run /app --no-launch-profile
+        "]
+
+  dotnet-7:
+    image: testlagoon/dotnet-7-sdk:pr-550
+    working_dir: /app
+    environment:
+      - ASPNETCORE_URLS=http://+:3000
+      - DOTNET_USE_POLLING_FILE_WATCHER=1
+    networks:
+      - default
+    labels:
+      lagoon.type: basic
+    ports:
+      - "3000"
+    command: ["sh", "-c", "
+        dotnet new web -n myWebApp -o /app --no-https;
+        dotnet run /app --no-launch-profile
+        "]

images/dotnet-runtime/6.Dockerfile

@@ -0,0 +1,34 @@
+ARG IMAGE_REPO
+FROM ${IMAGE_REPO:-lagoon}/commons as commons
+
+FROM mcr.microsoft.com/dotnet/runtime:6.0.32-alpine3.20
+
+LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
+LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"
+
+ENV LAGOON=dotnet-6-runtime
+
+# Copy commons files
+COPY --from=commons /lagoon /lagoon
+COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/
+COPY --from=commons /sbin/tini /sbin/
+COPY --from=commons /home /home
+
+RUN apk add --no-cache bash
+
+RUN fix-permissions /etc/passwd \
+    && mkdir -p /home
+
+ENV TMPDIR=/tmp \
+    TMP=/tmp \
+    HOME=/home \
+    # When Bash is invoked via `sh` it behaves like the old Bourne Shell and sources a file that is given in `ENV`
+    ENV=/home/.bashrc \
+    # When Bash is invoked as non-interactive (like `bash -c command`) it sources a file that is given in `BASH_ENV`
+    BASH_ENV=/home/.bashrc
+
+# Make sure shells are not running forever
+COPY 80-shell-timeout.sh /lagoon/entrypoints/
+RUN echo "source /lagoon/entrypoints/80-shell-timeout.sh" >> /home/.bashrc
+
+ENTRYPOINT ["/sbin/tini", "--", "/lagoon/entrypoints.sh"]

images/dotnet-runtime/7.Dockerfile

@@ -0,0 +1,34 @@
+ARG IMAGE_REPO
+FROM ${IMAGE_REPO:-lagoon}/commons as commons
+
+FROM mcr.microsoft.com/dotnet/runtime:7.0.1-alpine3.17
+
+LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
+LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"
+
+ENV LAGOON=dotnet-6-sdk
+
+# Copy commons files
+COPY --from=commons /lagoon /lagoon
+COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/
+COPY --from=commons /sbin/tini /sbin/
+COPY --from=commons /home /home
+
+RUN apk add --no-cache bash
+
+RUN fix-permissions /etc/passwd \
+    && mkdir -p /home
+
+ENV TMPDIR=/tmp \
+    TMP=/tmp \
+    HOME=/home \
+    # When Bash is invoked via `sh` it behaves like the old Bourne Shell and sources a file that is given in `ENV`
+    ENV=/home/.bashrc \
+    # When Bash is invoked as non-interactive (like `bash -c command`) it sources a file that is given in `BASH_ENV`
+    BASH_ENV=/home/.bashrc
+
+# Make sure shells are not running forever
+COPY 80-shell-timeout.sh /lagoon/entrypoints/
+RUN echo "source /lagoon/entrypoints/80-shell-timeout.sh" >> /home/.bashrc
+
+ENTRYPOINT ["/sbin/tini", "--", "/lagoon/entrypoints.sh"]

images/dotnet-runtime/8.Dockerfile

@@ -0,0 +1,34 @@
+ARG IMAGE_REPO
+FROM ${IMAGE_REPO:-lagoon}/commons as commons
+
+FROM mcr.microsoft.com/dotnet/runtime:8.0.7-alpine3.20
+
+LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
+LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"
+
+ENV LAGOON=dotnet-8-runtime
+
+# Copy commons files
+COPY --from=commons /lagoon /lagoon
+COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/
+COPY --from=commons /sbin/tini /sbin/
+COPY --from=commons /home /home
+
+RUN apk add --no-cache bash
+
+RUN fix-permissions /etc/passwd \
+    && mkdir -p /home
+
+ENV TMPDIR=/tmp \
+    TMP=/tmp \
+    HOME=/home \
+    # When Bash is invoked via `sh` it behaves like the old Bourne Shell and sources a file that is given in `ENV`
+    ENV=/home/.bashrc \
+    # When Bash is invoked as non-interactive (like `bash -c command`) it sources a file that is given in `BASH_ENV`
+    BASH_ENV=/home/.bashrc
+
+# Make sure shells are not running forever
+COPY 80-shell-timeout.sh /lagoon/entrypoints/
+RUN echo "source /lagoon/entrypoints/80-shell-timeout.sh" >> /home/.bashrc
+
+ENTRYPOINT ["/sbin/tini", "--", "/lagoon/entrypoints.sh"]

images/dotnet-runtime/80-shell-timeout.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# If we are running within kubernetes, set a shell timeout of 10mins.
+# We do that so old shells are closed and we can idle the cli container
+if [ $KUBERNETES_PORT ]; then
+  TMOUT=600
+fi

images/dotnet-sdk/6.Dockerfile

@@ -0,0 +1,34 @@
+ARG IMAGE_REPO
+FROM ${IMAGE_REPO:-lagoon}/commons as commons
+
+FROM mcr.microsoft.com/dotnet/sdk:6.0.424-alpine3.20
+
+LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
+LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"
+
+ENV LAGOON=dotnet-6-sdk
+
+# Copy commons files
+COPY --from=commons /lagoon /lagoon
+COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/
+COPY --from=commons /sbin/tini /sbin/
+COPY --from=commons /home /home
+
+RUN apk add --no-cache bash
+
+RUN fix-permissions /etc/passwd \
+    && mkdir -p /home
+
+ENV TMPDIR=/tmp \
+    TMP=/tmp \
+    HOME=/home \
+    # When Bash is invoked via `sh` it behaves like the old Bourne Shell and sources a file that is given in `ENV`
+    ENV=/home/.bashrc \
+    # When Bash is invoked as non-interactive (like `bash -c command`) it sources a file that is given in `BASH_ENV`
+    BASH_ENV=/home/.bashrc
+
+# Make sure shells are not running forever
+COPY 80-shell-timeout.sh /lagoon/entrypoints/
+RUN echo "source /lagoon/entrypoints/80-shell-timeout.sh" >> /home/.bashrc
+
+ENTRYPOINT ["/sbin/tini", "--", "/lagoon/entrypoints.sh"]

images/dotnet-sdk/7.Dockerfile

@@ -0,0 +1,34 @@
+ARG IMAGE_REPO
+FROM ${IMAGE_REPO:-lagoon}/commons as commons
+
+FROM mcr.microsoft.com/dotnet/sdk:7.0.101-alpine3.17
+
+LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
+LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"
+
+ENV LAGOON=dotnet-6-sdk
+
+# Copy commons files
+COPY --from=commons /lagoon /lagoon
+COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/
+COPY --from=commons /sbin/tini /sbin/
+COPY --from=commons /home /home
+
+RUN apk add --no-cache bash
+
+RUN fix-permissions /etc/passwd \
+    && mkdir -p /home
+
+ENV TMPDIR=/tmp \
+    TMP=/tmp \
+    HOME=/home \
+    # When Bash is invoked via `sh` it behaves like the old Bourne Shell and sources a file that is given in `ENV`
+    ENV=/home/.bashrc \
+    # When Bash is invoked as non-interactive (like `bash -c command`) it sources a file that is given in `BASH_ENV`
+    BASH_ENV=/home/.bashrc
+
+# Make sure shells are not running forever
+COPY 80-shell-timeout.sh /lagoon/entrypoints/
+RUN echo "source /lagoon/entrypoints/80-shell-timeout.sh" >> /home/.bashrc
+
+ENTRYPOINT ["/sbin/tini", "--", "/lagoon/entrypoints.sh"]

images/dotnet-sdk/8.Dockerfile

@@ -0,0 +1,34 @@
+ARG IMAGE_REPO
+FROM ${IMAGE_REPO:-lagoon}/commons as commons
+
+FROM mcr.microsoft.com/dotnet/sdk:8.0.303-alpine3.20
+
+LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
+LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"
+
+ENV LAGOON=dotnet-8-sdk
+
+# Copy commons files
+COPY --from=commons /lagoon /lagoon
+COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/
+COPY --from=commons /sbin/tini /sbin/
+COPY --from=commons /home /home
+
+RUN apk add --no-cache bash
+
+RUN fix-permissions /etc/passwd \
+    && mkdir -p /home
+
+ENV TMPDIR=/tmp \
+    TMP=/tmp \
+    HOME=/home \
+    # When Bash is invoked via `sh` it behaves like the old Bourne Shell and sources a file that is given in `ENV`
+    ENV=/home/.bashrc \
+    # When Bash is invoked as non-interactive (like `bash -c command`) it sources a file that is given in `BASH_ENV`
+    BASH_ENV=/home/.bashrc
+
+# Make sure shells are not running forever
+COPY 80-shell-timeout.sh /lagoon/entrypoints/
+RUN echo "source /lagoon/entrypoints/80-shell-timeout.sh" >> /home/.bashrc
+
+ENTRYPOINT ["/sbin/tini", "--", "/lagoon/entrypoints.sh"]

images/dotnet-sdk/80-shell-timeout.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# If we are running within kubernetes, set a shell timeout of 10mins.
+# We do that so old shells are closed and we can idle the cli container
+if [ $KUBERNETES_PORT ]; then
+  TMOUT=600
+fi