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.

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

Remove dotnet-framework-2004 as it is no longer supported #171

Merged
merged 1 commit into from
Sep 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
39 changes: 0 additions & 39 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -157,16 +157,12 @@ set-experimental:

build-windows-1809: build-windows-packages build-nanoserver-1809 build-dotnet-framework-1809

build-windows-2004: build-windows-packages build-dotnet-framework-2004

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-dotnet-framework-2004: build-stack-dotnet-framework-2004 build-builder-dotnet-framework-2004 build-buildpacks-dotnet-framework-2004

build-dotnet-framework-2022: build-stack-dotnet-framework-2022 build-builder-dotnet-framework-2022 build-buildpacks-dotnet-framework-2022

build-stack-nanoserver-1809:
Expand All @@ -177,10 +173,6 @@ build-stack-dotnet-framework-1809:
@echo "> Building 'dotnet-framework-1809' stack..."
bash stacks/build-stack.sh stacks/dotnet-framework-1809

build-stack-dotnet-framework-2004:
@echo "> Building 'dotnet-framework-2004' stack..."
bash stacks/build-stack.sh stacks/dotnet-framework-2004

build-stack-dotnet-framework-2022:
@echo "> Building 'dotnet-framework-2022' stack..."
bash stacks/build-stack.sh stacks/dotnet-framework-2022
Expand All @@ -193,10 +185,6 @@ 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-dotnet-framework-2004: build-windows-packages
@echo "> Building 'dotnet-framework-2004' builder..."
$(PACK_CMD) builder create cnbs/sample-builder:dotnet-framework-2004 --config $(SAMPLES_ROOT)/builders/dotnet-framework-2004/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)
Expand All @@ -212,10 +200,6 @@ 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)

build-buildpacks-dotnet-framework-2004: build-sample-root
@echo "> Creating 'dotnet-framework' app using 'dotnet-framework-2004' builder..."
$(PACK_CMD) build sample-dotnet-framework-app:dotnet-framework-2004 -v --builder cnbs/sample-builder:dotnet-framework-2004 --buildpack $(SAMPLES_ROOT)/buildpacks/dotnet-framework --path apps/aspnet $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)

build-buildpacks-dotnet-framework-2022: build-sample-root
@echo "> Creating 'dotnet-framework' app using 'dotnet-framework-2022' builder..."
$(PACK_CMD) build sample-dotnet-framework-app:dotnet-framework-2022 -v --builder cnbs/sample-builder:dotnet-framework-2022 --buildpack $(SAMPLES_ROOT)/buildpacks/dotnet-framework --path apps/aspnet $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
Expand All @@ -234,14 +218,10 @@ deploy-windows-packages:

deploy-windows-1809: deploy-windows-stacks-1809 deploy-windows-builders-1809

deploy-windows-2004: deploy-windows-stacks-2004 deploy-windows-builders-2004

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-2004: deploy-windows-stacks-dotnet-framework-2004

deploy-windows-stacks-2022: deploy-windows-stacks-dotnet-framework-2022

deploy-windows-stacks-nanoserver-1809:
Expand All @@ -255,20 +235,13 @@ deploy-windows-stacks-dotnet-framework-1809:
docker push cnbs/sample-stack-run:dotnet-framework-1809
docker push cnbs/sample-stack-build:dotnet-framework-1809

deploy-windows-stacks-dotnet-framework-2004:
@echo "> Deploying 'dotnet-framework-2004' stack..."
docker push cnbs/sample-stack-run:dotnet-framework-2004
docker push cnbs/sample-stack-build:dotnet-framework-2004

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-2004: deploy-windows-builders-dotnet-framework-2004

deploy-windows-builders-2022: deploy-windows-builders-dotnet-framework-2022

deploy-windows-builders-nanoserver-1809:
Expand All @@ -279,10 +252,6 @@ deploy-windows-builders-dotnet-framework-1809:
@echo "> Deploying 'dotnet-framework-1809' builder..."
docker push cnbs/sample-builder:dotnet-framework-1809

deploy-windows-builders-dotnet-framework-2004:
@echo "> Deploying 'dotnet-framework-2004' builder..."
docker push cnbs/sample-builder:dotnet-framework-2004

deploy-windows-builders-dotnet-framework-2022:
@echo "> Deploying 'dotnet-framework-2022' builder..."
docker push cnbs/sample-builder:dotnet-framework-2022
Expand All @@ -296,10 +265,6 @@ clean-windows:
@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 'dotnet-framework-2004' stack..."
docker rmi cnbs/sample-stack-run:dotnet-framework-2004 || true
docker rmi cnbs/sample-stack-build:dotnet-framework-2004 || true

@echo "> Removing 'dotnet-framework-2022' stack..."
docker rmi cnbs/sample-stack-run:dotnet-framework-2022 || true
Expand All @@ -308,7 +273,6 @@ clean-windows:
@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:dotnet-framework-2004 || true
docker rmi cnbs/sample-builder:dotnet-framework-2022 || true

@echo "> Removing 'nanoserver-1809' apps..."
Expand All @@ -319,9 +283,6 @@ clean-windows:
@echo "> Removing 'dotnet-framework-1809' apps..."
docker rmi sample-aspnet-app:dotnet-framework-1809 || true

@echo "> Removing 'dotnet-framework-2004' apps..."
docker rmi sample-aspnet-app:dotnet-framework-2004 || true

@echo "> Removing 'dotnet-framework-2022' apps..."
docker rmi sample-aspnet-app:dotnet-framework-2022 || true

Expand Down
23 changes: 0 additions & 23 deletions builders/dotnet-framework-2004/README.md

This file was deleted.

17 changes: 0 additions & 17 deletions builders/dotnet-framework-2004/builder.toml

This file was deleted.

3 changes: 0 additions & 3 deletions buildpacks/dotnet-framework/buildpack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,5 @@ api = "0.9"
[[stacks]]
id = "io.buildpacks.samples.stacks.dotnet-framework-1809"

[[stacks]]
id = "io.buildpacks.samples.stacks.dotnet-framework-2004"

[[stacks]]
id = "io.buildpacks.samples.stacks.dotnet-framework-2022"
3 changes: 0 additions & 3 deletions buildpacks/hello-moon-windows/buildpack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,5 @@ id = "io.buildpacks.samples.stacks.nanoserver-1809"
[[stacks]]
id = "io.buildpacks.samples.stacks.dotnet-framework-1809"

[[stacks]]
id = "io.buildpacks.samples.stacks.dotnet-framework-2004"

[[stacks]]
id = "io.buildpacks.samples.stacks.dotnet-framework-2022"
3 changes: 0 additions & 3 deletions buildpacks/hello-world-windows/buildpack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,5 @@ homepage = "https://github.com/buildpacks/samples/tree/main/buildpacks/hello-wor
[[stacks]]
id = "io.buildpacks.samples.stacks.nanoserver-1809"

[[stacks]]
id = "io.buildpacks.samples.stacks.dotnet-framework-2004"

[[stacks]]
id = "io.buildpacks.samples.stacks.dotnet-framework-2022"
15 changes: 0 additions & 15 deletions stacks/dotnet-framework-2004/build/Dockerfile

This file was deleted.

13 changes: 0 additions & 13 deletions stacks/dotnet-framework-2004/run/Dockerfile

This file was deleted.