Remove Remove dotnet-framework-1809 and upgrade nanoserver

To reduce the number of Windows samples and use later versions of things Signed-off-by: Natalie Arellano <narellano@vmware.com>
buildpacks · Sep 8, 2023 · 64cbf95 · 64cbf95
1 parent df23479
commit 64cbf95
Show file tree

Hide file tree

Showing 19 changed files with 64 additions and 176 deletions.
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -57,8 +57,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: windows-2019
-            version: 1809
           - os: windows-2022
             version: 2022
     runs-on: ${{ matrix.os }}

diff --git a/Makefile b/Makefile
@@ -155,50 +155,34 @@ set-experimental:
 ## Windows
 ####################
 
-build-windows-1809: build-windows-packages build-nanoserver-1809 build-dotnet-framework-1809
-
 build-windows-2022: build-windows-packages build-dotnet-framework-2022
 
-build-nanoserver-1809: build-stack-nanoserver-1809 build-builder-nanoserver-1809 build-buildpacks-nanoserver-1809
-
-build-dotnet-framework-1809: build-stack-dotnet-framework-1809 build-builder-dotnet-framework-1809 build-buildpacks-dotnet-framework-1809
+build-nanoserver-2022: build-stack-nanoserver-2022 build-builder-nanoserver-2022 build-buildpacks-nanoserver-2022
 
 build-dotnet-framework-2022: build-stack-dotnet-framework-2022 build-builder-dotnet-framework-2022 build-buildpacks-dotnet-framework-2022
 
-build-stack-nanoserver-1809:
-	@echo "> Building 'nanoserver-1809' stack..."
-	bash stacks/build-stack.sh stacks/nanoserver-1809
-
-build-stack-dotnet-framework-1809:
-	@echo "> Building 'dotnet-framework-1809' stack..."
-	bash stacks/build-stack.sh stacks/dotnet-framework-1809
+build-stack-nanoserver-2022:
+	@echo "> Building 'nanoserver-2022' stack..."
+	bash stacks/build-stack.sh stacks/nanoserver-2022
 
 build-stack-dotnet-framework-2022:
 	@echo "> Building 'dotnet-framework-2022' stack..."
 	bash stacks/build-stack.sh stacks/dotnet-framework-2022
 
-build-builder-nanoserver-1809: build-windows-packages
-	@echo "> Building 'nanoserver-1809' builder..."
-	$(PACK_CMD) builder create cnbs/sample-builder:nanoserver-1809 --config $(SAMPLES_ROOT)/builders/nanoserver-1809/builder.toml $(PULL_POLICY_NEVER)
-
-build-builder-dotnet-framework-1809: build-windows-packages
-	@echo "> Building 'dotnet-framework-1809' builder..."
-	$(PACK_CMD) builder create cnbs/sample-builder:dotnet-framework-1809 --config $(SAMPLES_ROOT)/builders/dotnet-framework-1809/builder.toml $(PULL_POLICY_NEVER)
+build-builder-nanoserver-2022: build-windows-packages
+	@echo "> Building 'nanoserver-2022' builder..."
+	$(PACK_CMD) builder create cnbs/sample-builder:nanoserver-2022 --config $(SAMPLES_ROOT)/builders/nanoserver-2022/builder.toml $(PULL_POLICY_NEVER)
 
 build-builder-dotnet-framework-2022: build-windows-packages
 	@echo "> Building 'dotnet-framework-2022' builder..."
 	$(PACK_CMD) builder create cnbs/sample-builder:dotnet-framework-2022 --config $(SAMPLES_ROOT)/builders/dotnet-framework-2022/builder.toml $(PULL_POLICY_NEVER)
 
-build-buildpacks-nanoserver-1809: build-sample-root
-	@echo "> Creating 'hello-moon-windows' app using 'nanoserver-1809' builder..."
-	$(PACK_CMD) build sample-hello-moon-windows-app:nanoserver-1809 -v --builder cnbs/sample-builder:nanoserver-1809 --buildpack $(SAMPLES_ROOT)/buildpacks/hello-world-windows --buildpack $(SAMPLES_ROOT)/buildpacks/hello-moon-windows $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
-
-	@echo "> Creating 'hello-world-windows' app using 'nanoserver-1809' builder..."
-	$(PACK_CMD) build sample-hello-world-windows-app:nanoserver-1809 -v --builder cnbs/sample-builder:nanoserver-1809 --buildpack $(SAMPLES_ROOT)/buildpacks/hello-world-windows $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
+build-buildpacks-nanoserver-2022: build-sample-root
+	@echo "> Creating 'hello-moon-windows' app using 'nanoserver-2022' builder..."
+	$(PACK_CMD) build sample-hello-moon-windows-app:nanoserver-2022 -v --builder cnbs/sample-builder:nanoserver-2022 --buildpack $(SAMPLES_ROOT)/buildpacks/hello-world-windows --buildpack $(SAMPLES_ROOT)/buildpacks/hello-moon-windows $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
 
-build-buildpacks-dotnet-framework-1809: build-sample-root
-	@echo "> Creating 'dotnet-framework' app using 'dotnet-framework-1809' builder..."
-	$(PACK_CMD) build sample-dotnet-framework-app:dotnet-framework-1809 -v --builder cnbs/sample-builder:dotnet-framework-1809 --buildpack $(SAMPLES_ROOT)/buildpacks/dotnet-framework --path apps/aspnet $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
+	@echo "> Creating 'hello-world-windows' app using 'nanoserver-2022' builder..."
+	$(PACK_CMD) build sample-hello-world-windows-app:nanoserver-2022 -v --builder cnbs/sample-builder:nanoserver-2022 --buildpack $(SAMPLES_ROOT)/buildpacks/hello-world-windows $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
 
 build-buildpacks-dotnet-framework-2022: build-sample-root
 	@echo "> Creating 'dotnet-framework' app using 'dotnet-framework-2022' builder..."
@@ -216,72 +200,49 @@ deploy-windows-packages:
 	docker push cnbs/sample-package:hello-world-windows
 	docker push cnbs/sample-package:hello-universe-windows
 
-deploy-windows-1809: deploy-windows-stacks-1809 deploy-windows-builders-1809
-
 deploy-windows-2022: deploy-windows-stacks-2022 deploy-windows-builders-2022
 
-deploy-windows-stacks-1809: deploy-windows-stacks-nanoserver-1809 deploy-windows-stacks-dotnet-framework-1809
+deploy-windows-stacks-2022: deploy-windows-stacks-dotnet-framework-2022 deploy-windows-stacks-nanoserver-2022
 
-deploy-windows-stacks-2022: deploy-windows-stacks-dotnet-framework-2022
-
-deploy-windows-stacks-nanoserver-1809:
-	@echo "> Deploying 'nanoserver-1809' stack..."
-	docker push cnbs/sample-stack-base:nanoserver-1809
-	docker push cnbs/sample-stack-run:nanoserver-1809
-	docker push cnbs/sample-stack-build:nanoserver-1809
-
-deploy-windows-stacks-dotnet-framework-1809:
-	@echo "> Deploying 'dotnet-framework-1809' stack..."
-	docker push cnbs/sample-stack-run:dotnet-framework-1809
-	docker push cnbs/sample-stack-build:dotnet-framework-1809
+deploy-windows-stacks-nanoserver-2022:
+	@echo "> Deploying 'nanoserver-2022' stack..."
+	docker push cnbs/sample-stack-base:nanoserver-2022
+	docker push cnbs/sample-stack-run:nanoserver-2022
+	docker push cnbs/sample-stack-build:nanoserver-2022
 
 deploy-windows-stacks-dotnet-framework-2022:
 	@echo "> Deploying 'dotnet-framework-2022' stack..."
 	docker push cnbs/sample-stack-run:dotnet-framework-2022
 	docker push cnbs/sample-stack-build:dotnet-framework-2022
 
-deploy-windows-builders-1809: deploy-windows-builders-nanoserver-1809 deploy-windows-builders-dotnet-framework-1809
-
-deploy-windows-builders-2022: deploy-windows-builders-dotnet-framework-2022
+deploy-windows-builders-2022: deploy-windows-builders-dotnet-framework-2022 deploy-windows-builders-nanoserver-2022
 
-deploy-windows-builders-nanoserver-1809:
-	@echo "> Deploying 'nanoserver-1809' builder..."
-	docker push cnbs/sample-builder:nanoserver-1809
-
-deploy-windows-builders-dotnet-framework-1809:
-	@echo "> Deploying 'dotnet-framework-1809' builder..."
-	docker push cnbs/sample-builder:dotnet-framework-1809
+deploy-windows-builders-nanoserver-2022:
+	@echo "> Deploying 'nanoserver-2022' builder..."
+	docker push cnbs/sample-builder:nanoserver-2022
 
 deploy-windows-builders-dotnet-framework-2022:
 	@echo "> Deploying 'dotnet-framework-2022' builder..."
 	docker push cnbs/sample-builder:dotnet-framework-2022
 
 clean-windows:
-	@echo "> Removing 'nanoserver-1809' stack..."
-	docker rmi cnbs/sample-stack-base:nanoserver-1809 || true
-	docker rmi cnbs/sample-stack-run:nanoserver-1809 || true
-	docker rmi cnbs/sample-stack-build:nanoserver-1809 || true
-
-	@echo "> Removing 'dotnet-framework-1809' stack..."
-	docker rmi cnbs/sample-stack-run:dotnet-framework-1809 || true
-	docker rmi cnbs/sample-stack-build:dotnet-framework-1809 || true
+	@echo "> Removing 'nanoserver-2022' stack..."
+	docker rmi cnbs/sample-stack-base:nanoserver-2022 || true
+	docker rmi cnbs/sample-stack-run:nanoserver-2022 || true
+	docker rmi cnbs/sample-stack-build:nanoserver-2022 || true
 
 	@echo "> Removing 'dotnet-framework-2022' stack..."
 	docker rmi cnbs/sample-stack-run:dotnet-framework-2022 || true
 	docker rmi cnbs/sample-stack-build:dotnet-framework-2022 || true
 
 	@echo "> Removing builders..."
-	docker rmi cnbs/sample-builder:nanoserver-1809 || true
-	docker rmi cnbs/sample-builder:dotnet-framework-1809 || true
+	docker rmi cnbs/sample-builder:nanoserver-2022 || true
 	docker rmi cnbs/sample-builder:dotnet-framework-2022 || true
 
-	@echo "> Removing 'nanoserver-1809' apps..."
-	docker rmi sample-hello-moon-windows-app:nanoserver-1809 || true
-	docker rmi sample-hello-world-windows-app:nanoserver-1809 || true
-	docker rmi sample-batch-script-app:nanoserver-1809 || true
-
-	@echo "> Removing 'dotnet-framework-1809' apps..."
-	docker rmi sample-aspnet-app:dotnet-framework-1809 || true
+	@echo "> Removing 'nanoserver-2022' apps..."
+	docker rmi sample-hello-moon-windows-app:nanoserver-2022 || true
+	docker rmi sample-hello-world-windows-app:nanoserver-2022 || true
+	docker rmi sample-batch-script-app:nanoserver-2022 || true
 
 	@echo "> Removing 'dotnet-framework-2022' apps..."
 	docker rmi sample-aspnet-app:dotnet-framework-2022 || true

diff --git a/apps/batch-script/README.md b/apps/batch-script/README.md
@@ -5,7 +5,7 @@ A runnable sample app demonstrating the usage of [project descriptor](https://gi
 ### Usage
 
 ```bash
-pack build sample-batch-script-app --builder cnbs/sample-builder:nanoserver-1809 --trust-builder
+pack build sample-batch-script-app --builder cnbs/sample-builder:nanoserver-2022 --trust-builder
 ```
 
 ### Extended Functionality

diff --git a/apps/batch-script/batch-script-buildpack/buildpack.toml b/apps/batch-script/batch-script-buildpack/buildpack.toml
@@ -9,4 +9,4 @@ name = "Batch Script Buildpack"
 
 # Stacks that the buildpack will work with
 [[stacks]]
-id = "io.buildpacks.samples.stacks.nanoserver-1809"
+id = "io.buildpacks.samples.stacks.nanoserver-2022"
diff --git a/builders/dotnet-framework-1809/README.md b/builders/dotnet-framework-1809/README.md
diff --git a/builders/dotnet-framework-1809/builder.toml b/builders/dotnet-framework-1809/builder.toml
diff --git a/builders/nanoserver-1809/README.md b/builders/nanoserver-1809/README.md
diff --git a/builders/nanoserver-2022/README.md b/builders/nanoserver-2022/README.md
@@ -0,0 +1,21 @@
+# Sample Nanoserver 2022 Builder
+
+### Prerequisites
+* Docker with Windows Containers and support for 2022 images
+
+### Usage
+
+#### Creating the builder
+
+```bash
+pack builder create cnbs/sample-builder:nanoserver-2022 --config builder.toml
+```
+
+#### Build app with builder
+
+```bash
+pack build sample-app --builder cnbs/sample-builder:nanoserver-2022 --path ../../apps/batch-script/ --trust-builder
+```
+
+_After building the app you should be able to simply run it via `docker run sample-app`
+and see an Buildpacks.io ASCII banner._
diff --git a/builders/nanoserver-1809/builder.toml → builders/nanoserver-2022/builder.toml b/builders/nanoserver-1809/builder.toml → builders/nanoserver-2022/builder.toml
@@ -10,6 +10,6 @@ version = "0.0.1"
 
 # Stack that will be used by the builder
 [stack]
-id = "io.buildpacks.samples.stacks.nanoserver-1809"
-run-image = "cnbs/sample-stack-run:nanoserver-1809"
-build-image = "cnbs/sample-stack-build:nanoserver-1809"
+id = "io.buildpacks.samples.stacks.nanoserver-2022"
+run-image = "cnbs/sample-stack-run:nanoserver-2022"
+build-image = "cnbs/sample-stack-build:nanoserver-2022"
diff --git a/buildpacks/dotnet-framework/buildpack.toml b/buildpacks/dotnet-framework/buildpack.toml
@@ -6,7 +6,7 @@ api = "0.9"
   name = "Sample .NET Framework Buildpack"
 
 [[stacks]]
-  id = "io.buildpacks.samples.stacks.dotnet-framework-1809"
+  id = "io.buildpacks.samples.stacks.dotnet-framework-2022"
 
 [[stacks]]
   id = "io.buildpacks.samples.stacks.dotnet-framework-2022"
diff --git a/buildpacks/hello-moon-windows/buildpack.toml b/buildpacks/hello-moon-windows/buildpack.toml
@@ -10,10 +10,7 @@ homepage = "https://github.com/buildpacks/samples/tree/main/buildpacks/hello-moo
 
 # Stacks that the buildpack will work with
 [[stacks]]
-id = "io.buildpacks.samples.stacks.nanoserver-1809"
-
-[[stacks]]
-id = "io.buildpacks.samples.stacks.dotnet-framework-1809"
+id = "io.buildpacks.samples.stacks.nanoserver-2022"
 
 [[stacks]]
   id = "io.buildpacks.samples.stacks.dotnet-framework-2022"
diff --git a/buildpacks/hello-universe-windows/README.md b/buildpacks/hello-universe-windows/README.md
@@ -6,7 +6,7 @@ A no-op meta-buildpack whose intent is to show how meta-buildpacks are construct
 
 ```bash
 pack build sample-hello-universe-windows-app \
-    --builder cnbs/sample-builder:nanoserver-1809 \
+    --builder cnbs/sample-builder:nanoserver-2022 \
     --buildpack . \
     --buildpack ../hello-world-windows/ \
     --buildpack ../hello-moon-windows/

diff --git a/buildpacks/hello-world-windows/README.md b/buildpacks/hello-world-windows/README.md
@@ -3,12 +3,12 @@
 A no-op buildpack whose intent is to show minimal requirements of a buildpack on Windows.
 
 ### Prerequisites
-* Docker with Windows Containers and support for 1809 images
+* Docker with Windows Containers and support for 2022 images
 
 ### Usage
 
 ```bash
-pack build sample-hello-world-windows-app --builder cnbs/sample-builder:nanoserver-1809 --buildpack . --trust-builder
+pack build sample-hello-world-windows-app --builder cnbs/sample-builder:nanoserver-2022 --buildpack . --trust-builder
 ```
 
 THEN

diff --git a/buildpacks/hello-world-windows/buildpack.toml b/buildpacks/hello-world-windows/buildpack.toml
@@ -9,7 +9,7 @@ name = "Hello World Buildpack"
 homepage = "https://github.com/buildpacks/samples/tree/main/buildpacks/hello-world-windows"
 
 [[stacks]]
-id = "io.buildpacks.samples.stacks.nanoserver-1809"
+id = "io.buildpacks.samples.stacks.nanoserver-2022"
 
 [[stacks]]
   id = "io.buildpacks.samples.stacks.dotnet-framework-2022"
diff --git a/stacks/dotnet-framework-1809/build/Dockerfile b/stacks/dotnet-framework-1809/build/Dockerfile
diff --git a/stacks/dotnet-framework-1809/run/Dockerfile b/stacks/dotnet-framework-1809/run/Dockerfile
diff --git a/stacks/nanoserver-1809/base/Dockerfile → stacks/nanoserver-2022/base/Dockerfile b/stacks/nanoserver-1809/base/Dockerfile → stacks/nanoserver-2022/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/windows/nanoserver:1809
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
 
 # non-zero sets all user-owned directories to BUILTIN\Users
 ARG cnb_uid=1

diff --git a/stacks/nanoserver-1809/build/Dockerfile → stacks/nanoserver-2022/build/Dockerfile b/stacks/nanoserver-1809/build/Dockerfile → stacks/nanoserver-2022/build/Dockerfile
diff --git a/stacks/nanoserver-1809/run/Dockerfile → stacks/nanoserver-2022/run/Dockerfile b/stacks/nanoserver-1809/run/Dockerfile → stacks/nanoserver-2022/run/Dockerfile