Skip to content

Commit 57f3ee1

Browse files
authored
Merge pull request #193 from buildpacks/feature/deprecate-wcow
Remove WCOW examples
2 parents 36723f1 + a0c91d8 commit 57f3ee1

File tree

28 files changed

+1
-653
lines changed

28 files changed

+1
-653
lines changed

.github/workflows/build-and-deploy.yml

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -51,82 +51,3 @@ jobs:
5151
run: make deploy-linux
5252
- name: Clean up
5353
run: make clean-linux
54-
build-deploy-windows:
55-
strategy:
56-
matrix:
57-
include:
58-
- os: windows-2022
59-
version: 2022
60-
runs-on: ${{ matrix.os }}
61-
steps:
62-
- uses: actions/checkout@v3
63-
- name: Determine download URL for latest pack
64-
id: pack-download-url
65-
uses: actions/github-script@v6
66-
with:
67-
github-token: ${{secrets.GITHUB_TOKEN}}
68-
result-encoding: string
69-
# FIXME: Revert back to 'getLatestRelease' when pack v0.31.0 is released
70-
script: |
71-
return github.rest.repos.getReleaseByTag({
72-
owner: "buildpacks",
73-
repo: "pack",
74-
tag: "v0.31.0-rc1"
75-
}).then(result => {
76-
return result.data.assets
77-
.filter(a => a.name.includes("windows"))
78-
.map(a => a.browser_download_url)[0];
79-
})
80-
- name: Install pack
81-
run: |
82-
curl -s -L -o pack.zip ${{ steps.pack-download-url.outputs.result }}
83-
tar -xvf pack.zip
84-
mkdir ~\.pack
85-
- name: Set Experimental
86-
run: make set-experimental
87-
- name: Build
88-
run: make build-windows-${{ matrix.version }}
89-
- uses: azure/docker-login@v1
90-
if: ${{ github.ref == 'refs/heads/main' }}
91-
with:
92-
username: cnbs
93-
password: ${{ secrets.REGISTRY_PASSWORD }}
94-
- name: Deploy
95-
if: ${{ github.ref == 'refs/heads/main' }}
96-
run: make deploy-windows-${{ matrix.version }}
97-
build-deploy-windows-packages:
98-
runs-on: windows-2022
99-
steps:
100-
- uses: actions/checkout@v3
101-
- name: Determine download URL for latest pack
102-
id: pack-download-url
103-
uses: actions/github-script@v6
104-
with:
105-
github-token: ${{secrets.GITHUB_TOKEN}}
106-
result-encoding: string
107-
script: |
108-
return github.rest.repos.getLatestRelease({
109-
owner: "buildpacks",
110-
repo: "pack"
111-
}).then(result => {
112-
return result.data.assets
113-
.filter(a => a.name.includes("windows"))
114-
.map(a => a.browser_download_url)[0];
115-
})
116-
- name: Install pack
117-
run: |
118-
curl -s -L -o pack.zip ${{ steps.pack-download-url.outputs.result }}
119-
tar -xvf pack.zip
120-
mkdir ~\.pack
121-
- name: Set Experimental
122-
run: make set-experimental
123-
- name: Build
124-
run: make build-windows-packages
125-
- uses: azure/docker-login@v1
126-
if: ${{ github.ref == 'refs/heads/main' }}
127-
with:
128-
username: cnbs
129-
password: ${{ secrets.REGISTRY_PASSWORD }}
130-
- name: Deploy
131-
if: ${{ github.ref == 'refs/heads/main' }}
132-
run: make deploy-windows-packages

Makefile

Lines changed: 1 addition & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PULL_POLICY_NEVER?=--pull-policy=never
22
PACK_BUILD_FLAGS?=--trust-builder
33
PACK_CMD?=pack
44

5-
clean: clean-linux clean-windows
5+
clean: clean-linux
66

77
####################
88
## Linux
@@ -153,109 +153,6 @@ set-experimental:
153153
@echo "> Setting experimental"
154154
$(PACK_CMD) config experimental true
155155

156-
####################
157-
## Windows
158-
####################
159-
160-
build-windows-2022: build-windows-packages build-dotnet-framework-2022 build-nanoserver-2022
161-
162-
build-nanoserver-2022: build-base-nanoserver-2022 build-builder-nanoserver-2022 build-buildpacks-nanoserver-2022
163-
164-
build-dotnet-framework-2022: build-base-dotnet-framework-2022 build-builder-dotnet-framework-2022 build-buildpacks-dotnet-framework-2022
165-
166-
build-base-nanoserver-2022:
167-
@echo "> Building 'nanoserver-2022' base images..."
168-
bash base-images/build.sh nanoserver-2022
169-
170-
build-base-dotnet-framework-2022:
171-
@echo "> Building 'dotnet-framework-2022' base images..."
172-
bash base-images/build.sh dotnet-framework-2022
173-
174-
build-builder-nanoserver-2022: build-windows-packages
175-
@echo "> Building 'nanoserver-2022' builder..."
176-
$(PACK_CMD) builder create cnbs/sample-builder:nanoserver-2022 --config $(SAMPLES_ROOT)/builders/nanoserver-2022/builder.toml $(PULL_POLICY_NEVER)
177-
178-
build-builder-dotnet-framework-2022: build-windows-packages
179-
@echo "> Building 'dotnet-framework-2022' builder..."
180-
$(PACK_CMD) builder create cnbs/sample-builder:dotnet-framework-2022 --config $(SAMPLES_ROOT)/builders/dotnet-framework-2022/builder.toml $(PULL_POLICY_NEVER)
181-
182-
build-buildpacks-nanoserver-2022: build-sample-root
183-
@echo "> Creating 'hello-moon-windows' app using 'nanoserver-2022' builder..."
184-
$(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)
185-
186-
@echo "> Creating 'hello-world-windows' app using 'nanoserver-2022' builder..."
187-
$(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)
188-
189-
build-buildpacks-dotnet-framework-2022: build-sample-root
190-
@echo "> Creating 'dotnet-framework' app using 'dotnet-framework-2022' builder..."
191-
$(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)
192-
193-
build-windows-packages: build-sample-root
194-
@echo "> Creating 'hello-world-windows' buildpack package"
195-
$(PACK_CMD) buildpack package cnbs/sample-package:hello-world-windows --config $(SAMPLES_ROOT)/$(PACKAGES_DIR)/hello-world-windows/package.toml $(PULL_POLICY_NEVER)
196-
197-
@echo "> Creating 'hello-universe-windows' buildpack package"
198-
$(PACK_CMD) buildpack package cnbs/sample-package:hello-universe-windows --config $(SAMPLES_ROOT)/$(PACKAGES_DIR)/hello-universe-windows/package.toml $(PULL_POLICY_NEVER)
199-
200-
deploy-windows-packages:
201-
@echo "> Deploying windows packages..."
202-
docker push cnbs/sample-package:hello-world-windows
203-
docker push cnbs/sample-package:hello-universe-windows
204-
205-
deploy-windows-2022: deploy-windows-bases-2022 deploy-windows-builders-2022
206-
207-
deploy-windows-bases-2022: deploy-windows-bases-dotnet-framework-2022 deploy-windows-bases-nanoserver-2022
208-
209-
deploy-windows-bases-nanoserver-2022:
210-
@echo "> Deploying 'nanoserver-2022' base images..."
211-
docker push cnbs/sample-base:nanoserver-2022
212-
docker push cnbs/sample-base-run:nanoserver-2022
213-
docker push cnbs/sample-base-build:nanoserver-2022
214-
215-
deploy-windows-bases-dotnet-framework-2022:
216-
@echo "> Deploying 'dotnet-framework-2022' base images..."
217-
docker push cnbs/sample-base-run:dotnet-framework-2022
218-
docker push cnbs/sample-base-build:dotnet-framework-2022
219-
220-
deploy-windows-builders-2022: deploy-windows-builders-dotnet-framework-2022 deploy-windows-builders-nanoserver-2022
221-
222-
deploy-windows-builders-nanoserver-2022:
223-
@echo "> Deploying 'nanoserver-2022' builder..."
224-
docker push cnbs/sample-builder:nanoserver-2022
225-
226-
deploy-windows-builders-dotnet-framework-2022:
227-
@echo "> Deploying 'dotnet-framework-2022' builder..."
228-
docker push cnbs/sample-builder:dotnet-framework-2022
229-
230-
clean-windows:
231-
@echo "> Removing 'nanoserver-2022' base images..."
232-
docker rmi cnbs/sample-base:nanoserver-2022 || true
233-
docker rmi cnbs/sample-base-run:nanoserver-2022 || true
234-
docker rmi cnbs/sample-base-build:nanoserver-2022 || true
235-
236-
@echo "> Removing 'dotnet-framework-2022' base images..."
237-
docker rmi cnbs/sample-base-run:dotnet-framework-2022 || true
238-
docker rmi cnbs/sample-base-build:dotnet-framework-2022 || true
239-
240-
@echo "> Removing builders..."
241-
docker rmi cnbs/sample-builder:nanoserver-2022 || true
242-
docker rmi cnbs/sample-builder:dotnet-framework-2022 || true
243-
244-
@echo "> Removing 'nanoserver-2022' apps..."
245-
docker rmi sample-hello-moon-windows-app:nanoserver-2022 || true
246-
docker rmi sample-hello-world-windows-app:nanoserver-2022 || true
247-
docker rmi sample-batch-script-app:nanoserver-2022 || true
248-
249-
@echo "> Removing 'dotnet-framework-2022' apps..."
250-
docker rmi sample-aspnet-app:dotnet-framework-2022 || true
251-
252-
@echo "> Removing packages..."
253-
docker rmi cnbs/sample-package:hello-world-windows || true
254-
docker rmi cnbs/sample-package:hello-universe-windows || true
255-
256-
@echo "> Removing '.tmp'"
257-
rm -rf .tmp
258-
259156
####################
260157
## Windows pack for any daemon OS
261158
####################

base-images/dotnet-framework-2022/base/Dockerfile

Lines changed: 0 additions & 11 deletions
This file was deleted.

base-images/dotnet-framework-2022/build/Dockerfile

Lines changed: 0 additions & 16 deletions
This file was deleted.

base-images/dotnet-framework-2022/run/Dockerfile

Lines changed: 0 additions & 15 deletions
This file was deleted.

base-images/nanoserver-2022/base/Dockerfile

Lines changed: 0 additions & 14 deletions
This file was deleted.

base-images/nanoserver-2022/build/Dockerfile

Lines changed: 0 additions & 16 deletions
This file was deleted.

base-images/nanoserver-2022/run/Dockerfile

Lines changed: 0 additions & 5 deletions
This file was deleted.

builders/dotnet-framework-2022/README.md

Lines changed: 0 additions & 23 deletions
This file was deleted.

builders/dotnet-framework-2022/builder.toml

Lines changed: 0 additions & 24 deletions
This file was deleted.

builders/nanoserver-2022/README.md

Lines changed: 0 additions & 21 deletions
This file was deleted.

builders/nanoserver-2022/builder.toml

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)