Merge pull request #225 from HarrisonWAffel/wins-suc-image-improvements

Improving the SUC image

.github/workflows/PR.yaml

@@ -1,6 +1,7 @@
 name: Pull Request
 
 on:
+  push:
   pull_request:
 
 permissions:
@@ -15,10 +16,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64
+        uses: golangci/golangci-lint-action@v6.1.0
         with:
           args: --timeout=10m
-          version: v1.55
+          version: v1.59
 
   test:
     strategy:

.github/workflows/release.yaml

@@ -16,7 +16,7 @@ jobs:
       contents: read
       id-token: write
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: retrieve dockerhub credentials
         uses: rancher-eio/read-vault-secrets@main
@@ -26,7 +26,7 @@ jobs:
             secret/data/github/repo/${{ github.repository }}/dockerhub/rancher/credentials password | DOCKER_PASSWORD
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+        uses: docker/login-action@v3
         with:
           username: ${{ env.DOCKER_USERNAME }}
           password: ${{ env.DOCKER_PASSWORD }}
@@ -67,7 +67,7 @@ jobs:
       contents: read
       id-token: write
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: retrieve dockerhub credentials
         uses: rancher-eio/read-vault-secrets@main
         with:
@@ -76,7 +76,7 @@ jobs:
             secret/data/github/repo/${{ github.repository }}/dockerhub/rancher/credentials password | DOCKER_PASSWORD
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+        uses: docker/login-action@v3
         with:
           username: ${{ env.DOCKER_USERNAME }}
           password: ${{ env.DOCKER_PASSWORD }}
@@ -99,11 +99,11 @@ jobs:
       # which cannot be installed onto windows VMs. Additionally, it is not possible to cross compile
       # Windows images on linux. So, we're stuck with manual docker commands.
       - name: Build Windows 2019
-        run: ./scripts/build-image.ps1 -ServerCoreVersion "1809" -Repo "${{ env.REPO }}" -Tag "${{ env.TAG }}"
+        run: ./scripts/build-image.ps1 -ServerCoreVersion "ltsc2019" -Repo "${{ env.REPO }}" -Tag "${{ env.TAG }}"
 
       - name: push images
         run: |
-          docker push ${{ env.REPO }}/wins:${{ env.TAG }}-windows-1809
+          docker push ${{ env.REPO }}/wins:${{ env.TAG }}-windows-ltsc2019
 
   create-github-release:
     needs: [ create-push-image-windows-2019, create-push-image-windows-2022 ]
@@ -151,12 +151,12 @@ jobs:
             secret/data/github/repo/${{ github.repository }}/dockerhub/rancher/credentials password | DOCKER_PASSWORD
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+        uses: docker/login-action@v3
         with:
           username: ${{ env.DOCKER_USERNAME }}
           password: ${{ env.DOCKER_PASSWORD }}
 
       - name: create manifest list
         run: |
-          docker manifest create ${{ env.REPO }}/wins:${{ env.TAG }} ${{ env.REPO }}/wins:${{ env.TAG }}-windows-ltsc2022 ${{ env.REPO }}/wins:${{ env.TAG }}-windows-1809
+          docker manifest create ${{ env.REPO }}/wins:${{ env.TAG }} ${{ env.REPO }}/wins:${{ env.TAG }}-windows-ltsc2022 ${{ env.REPO }}/wins:${{ env.TAG }}-windows-ltsc2019
           docker manifest push ${{ env.REPO }}/wins:${{ env.TAG }}

Dockerfile

@@ -1,5 +1,5 @@
-ARG SERVERCORE_VERSION
-FROM mcr.microsoft.com/windows/servercore:${SERVERCORE_VERSION} as wins
+ARG NANOSERVER_VERSION
+FROM mcr.microsoft.com/windows/nanoserver:${NANOSERVER_VERSION} as wins
 ARG VERSION
 ARG MAINTAINERS
 ARG REPO
@@ -19,14 +19,8 @@ LABEL org.opencontainers.image.vendor="Rancher Labs"
 LABEL org.opencontainers.image.version=${VERSION}
 WORKDIR C:/
 
-COPY ./artifacts C:/
-# staging for backwards compatibility
-# Create a symbolic link pwsh.exe that points to powershell.exe for consistency
-RUN New-Item -ItemType SymbolicLink -Target "C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe" -Path "C:\Windows\System32\WindowsPowerShell\v1.0\pwsh.exe" ; \
-    Copy-Item wins.exe -Destination C:/Windows
+COPY ./artifacts/wins-suc.exe C:/
+COPY ./suc/update-connection-info.ps1 C:/
 
 USER ContainerAdministrator
-ENTRYPOINT [ "powershell", "-Command", "./run.ps1"]
-
-
-
+ENTRYPOINT [ "wins-suc.exe" ]