Merge pull request #11 from ptr727/develop

Develop

Author: ptr727

.github/workflows/BuildPublishPipeline.yml

@@ -1,9 +1,5 @@
 name: 'Build and Publish Docker Images'
 
-env:
-  # Push main branch only, else just build
-  DOCKER_PUSH: ${{ github.ref == 'refs/heads/main' }}
-
 on:
   push:
     branches: [main, develop]
@@ -15,6 +11,7 @@ on:
     - cron: "0 2 * * MON"
 
 jobs:
+
   build:
     name: 'Build and Publish Docker Images'
     runs-on: ubuntu-latest
@@ -28,6 +25,8 @@ jobs:
       # https://github.com/marketplace/actions/docker-setup-qemu
       - name: 'Setup QEMU'
         uses: docker/setup-qemu-action@v2
+        with:
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
 
       # https://github.com/marketplace/actions/docker-setup-buildx
       - name: 'Setup Docker Buildx'
@@ -41,40 +40,10 @@ jobs:
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
       # https://github.com/marketplace/actions/build-and-push-docker-images
-
-      # .NET 6.0
-      - name: 'Build and Push .NET 6.0'
-        uses: docker/build-push-action@v4
-        with:
-          platforms: linux/amd64
-          push: ${{ env.DOCKER_PUSH }}
-          tags: |
-            ptr727/vscode-server-dotnetcore:6.0
-          build-args: |
-            LABEL_VERSION=6.0
-            INSTALL_VERSION=dotnet-sdk-6.0
-
-      # .NET 7.0
-      - name: 'Build and Push .NET 7.0'
-        uses: docker/build-push-action@v4
-        with:
-          platforms: linux/amd64
-          push: ${{ env.DOCKER_PUSH }}
-          tags: |
-            ptr727/vscode-server-dotnetcore:7.0
-          build-args: |
-            LABEL_VERSION=7.0
-            INSTALL_VERSION=dotnet-sdk-7.0
-
-      # .NET 6.0 and .NET 7.0
-      - name: 'Build and Push .NET 6.0 and .NET 7.0'
+      - name: 'Build and Push .NET LTS and STS'
         uses: docker/build-push-action@v4
         with:
-          platforms: linux/amd64
-          push: ${{ env.DOCKER_PUSH }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: ${{ (github.event_name != 'pull_request') }}
           tags: |
-            ptr727/vscode-server-dotnetcore:latest
-            ptr727/vscode-server-dotnetcore:60.70
-          build-args: |
-            LABEL_VERSION=60.70
-            "INSTALL_VERSION=dotnet-sdk-6.0 dotnet-sdk-7.0"
+            ptr727/vscode-server-dotnetcore:${{ endsWith(github.ref, 'refs/heads/main') && 'latest' || 'develop' }}

.github/workflows/DockerHubDescription.yml

@@ -12,14 +12,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      # https://github.com/actions/checkout
+      # https://github.com/marketplace/actions/checkout
       - name: 'Checkout Code'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # https://github.com/marketplace/actions/docker-hub-description
-      # Access tokens cannot update readme.md, we have to use the real password
       - name: 'Update Docker Hub Description'
-        uses: peter-evans/dockerhub-description@v2
+        uses: peter-evans/dockerhub-description@v3
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}

Dockerfile

@@ -1,48 +1,75 @@
-# Test in docker shell:
+# Test base image in shell:
 # docker run -it --rm --pull always --name Testing lscr.io/linuxserver/code-server:latest /bin/bash
 # export DEBIAN_FRONTEND=noninteractive
 
+# Test image in shell:
+# docker run -it --rm --pull always --name Testing ptr727/vscode-server-dotnetcore:develop /bin/bash
+
+# Build Dockerfile
+# docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --tag testing:latest .
+
+# Test linux/amd64 target
+# docker buildx build --load --progress plain --no-cache --platform linux/amd64 --tag testing:latest .
+# docker run -it --rm --name Testing testing:latest /bin/bash
+
+
+
 # https://github.com/linuxserver/docker-code-server
 FROM lscr.io/linuxserver/code-server:latest
 
+# Image label
+# TODO: Get current STS and LTS versions dynamically
 ARG LABEL_VERSION="60.70"
-ARG INSTALL_VERSION="dotnet-sdk-6.0 dotnet-sdk-7.0"
-
 LABEL name="VSCode-Server-DotNet" \
     version=${LABEL_VERSION} \
-    description="VSCode Server with .NET Core SDK and PowerShell Pre-Installed" \
+    description="VSCode Server with .NET SDK Pre-Installed" \
     maintainer="Pieter Viljoen <ptr727@users.noreply.github.com>"
 
-    # Enable .NET detection of running in a container
-    # See: https://github.com/dotnet/dotnet-docker/blob/master/3.0/sdk/bionic/amd64/Dockerfile
+# See: https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/jammy/amd64/Dockerfile
 ENV DOTNET_RUNNING_IN_CONTAINER=true \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
     NUGET_XMLDOC_MODE=skip \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # Unset ASPNETCORE_URLS from aspnet base image
+    ASPNETCORE_URLS= \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
     # No installer frontend interaction
     DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update \
-    # Install pre-requisites
-    && apt-get install -y wget apt-transport-https software-properties-common \
-    # Register the Microsoft repository
-    && wget https://packages.microsoft.com/config/ubuntu/$(lsb_release -sr)/packages-microsoft-prod.deb \
-    && dpkg -i packages-microsoft-prod.deb \
-    && rm packages-microsoft-prod.deb \
-    && touch /etc/apt/preferences \
-    && echo "Package: *" >> /etc/apt/preferences \
-    && echo "Pin: origin \"packages.microsoft.com\"" >> /etc/apt/preferences \
-    && echo "Pin-Priority: 1001" >> /etc/apt/preferences \
-    && cat /etc/apt/preferences \
-    && cat /etc/apt/sources.list.d/microsoft-prod.list \
-    # Update
-    && apt-get update \
-    && apt-get upgrade -y \
-    # Install .NET SDK and PowerShell
-    # https://docs.microsoft.com/en-us/dotnet/core/install/linux-ubuntu
-    # https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell-core-on-linux
-    && apt-get install -y ${INSTALL_VERSION} powershell \
-    && dotnet --info \
+# Prerequisites
+# https://learn.microsoft.com/en-us/dotnet/core/install/linux-ubuntu#dependencies
+RUN apt-get update && apt-get upgrade -y \
+    && apt-get install -y --no-install-recommends \
+        libc6 \
+        libgcc1 \
+        libgcc-s1 \
+        libgssapi-krb5-2 \
+        libicu70 \
+        liblttng-ust1 \
+        libssl3 \
+        libstdc++6 \
+        libunwind8 \
+        wget  \
+        zlib1g \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# TODO: What is preferred way to set the root and get in path?
+ENV DOTNET_ROOT=/usr/share/dotnet
+ENV DOTNET_CLI_HOME=/usr/share/dotnet
+
+# Install .NET
+# https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script
+RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh \ 
+    && chmod +x ./dotnet-install.sh \
+    && ./dotnet-install.sh --install-dir /usr/share/dotnet --version latest --channel LTS\
+    && ./dotnet-install.sh --install-dir /usr/share/dotnet --version latest --channel STS\
+    && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \
+    && dotnet --list-runtimes \
+    && dotnet --list-sdks \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*

README.md

@@ -1,6 +1,6 @@
-# VSCode Server with .NET Core SDK and PowerShell Pre-Installed
+# VSCode Server with .NET Pre-Installed
 
-This is a docker image of VSCode Server with the .NET SDK and PowerShell pre-installed.  
+This is a docker image of VSCode Server with the .NET LTS and STS SDK's pre-installed.  
 Docker image is based on [LinuxServer.io Code-Server](https://github.com/linuxserver/docker-code-server), which is based on [Coder.com Code-Server](https://github.com/cdr/code-server).  
 
 ## License
@@ -9,39 +9,29 @@ Docker image is based on [LinuxServer.io Code-Server](https://github.com/linuxse
 
 ## Build Status
 
-[Code and Pipline is on GitHub](https://github.com/ptr727/VSCode-Server-DotNetCore):  
+[Code and Pipeline is on GitHub](https://github.com/ptr727/VSCode-Server-DotNetCore):  
 ![GitHub Last Commit](https://img.shields.io/github/last-commit/ptr727/VSCode-Server-DotNetCore?logo=github)  
 ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/ptr727/VSCode-Server-DotNetCore/BuildPublishPipeline.yml?logo=github)
 
 ## Container Images
 
 Docker container images are published on [Docker Hub](https://hub.docker.com/r/ptr727/vscode-server-dotnetcore).  
-Images are tagged using `latest`, `6.0`, and `7.0`.  
-`latest` includes .NET 6.0 and .NET 7.0.  
-Images are automatically rebuilt every Monday morning, picking up the latest updates.  
+Multi-Architecture images are created for `linux/amd64`, `linux/arm64`, and `linux/arm/v7`.  
+Tags are `latest` for `main` branch and `develop` for `develop` branch.  
+E.g. `docker pull ptr727/vscode-server-dotnetcore:latest`  
+E.g. `docker pull ptr727/vscode-server-dotnetcore:develop`
+
+Builds include the LTS and STS [supported versions](https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core) of .NET SDK's.  
+Currently .NET 6.0 and .NET 7.0.
+
+Images are automatically rebuilt every Monday morning, picking up the latest upstream updates.  
 ![Docker Pulls](https://img.shields.io/docker/pulls/ptr727/vscode-server-dotnetcore?logo=docker)  
 ![Docker Image Version](https://img.shields.io/docker/v/ptr727/vscode-server-dotnetcore/latest?logo=docker)
 
 ## Usage
 
 Follow the [linuxserver/code-server](https://github.com/linuxserver/docker-code-server) instructions.
 
-## Background Info
-
-- [DotNet in Docker](https://github.com/dotnet/dotnet-docker/blob/master/3.0/sdk/bionic/amd64/Dockerfile)
-- [LSIO Code Server Docker](https://github.com/linuxserver/docker-code-server/blob/master/Dockerfile)
-- [Coder Code Server Docker](https://github.com/cdr/code-server/blob/master/Dockerfile)
-- [DotNet install](https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-ubuntu-1804)
-- [PowerShell install](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell-core-on-linux?view=powershell-7#ubuntu-1804)
-- [Package Manager](https://dotnet.microsoft.com/download/linux-package-manager/ubuntu18-04/sdk-current)
-
 ## Notes
 
-- .NET 5 and .NET Core 3.1 and older are [no longer supported](https://learn.microsoft.com/en-us/dotnet/core/install/linux-ubuntu) on Ubuntu Jammy.
-- codercom/code-server runs as root, not permission friendly when mapping volumes.
-- linuxserver/code-server allows specifying PUID and GUID, ideal when using mapped volumes in e.g. UnRaid.
-- Use `cat /etc/*-release` to determine the base image, installed packages must match the base image.
-- Run DotNet Core by `dotnet` in the console.
-- Run PowerShell by `pwsh` in the console.
-- If installing PowerShell Core Preview use `powershell-preview` and `pwsh-preview` to launch.
-- An alternative to building on top of the LSIO image, is to use a [dynamic overlay](https://blog.linuxserver.io/2019/09/14/customizing-our-containers/).
+- When Multi-Arch image support was added, PowerShell was removed because installing it on all platforms was non-trivial. Let me know if you really need it, and I'll reinvestigate.