Skip to content

Commit 0964527

Browse files
authored
Merge pull request #273 from phillipsj/feature/remove-windows
2 parents 272315a + c51ab3e commit 0964527

File tree

5 files changed

+0
-401
lines changed

5 files changed

+0
-401
lines changed

.drone.yml

Lines changed: 0 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -88,140 +88,6 @@ volumes:
8888
path: /var/run/docker.sock
8989
---
9090
kind: pipeline
91-
name: windows-1809-pr
92-
93-
platform:
94-
os: windows
95-
arch: amd64
96-
version: 1809
97-
98-
steps:
99-
- name: hyperkube-windows-1809-pr
100-
image: rancher/dapper:v0.5.7
101-
commands:
102-
- "docker build -f Dockerfile.windows --build-arg SERVERCORE_VERSION=1809 ."
103-
volumes:
104-
- name: docker_pipe
105-
path: \\\\.\\pipe\\docker_engine
106-
when:
107-
event:
108-
- pull_request
109-
110-
volumes:
111-
- name: docker_pipe
112-
host:
113-
path: \\\\.\\pipe\\docker_engine
114-
115-
---
116-
kind: pipeline
117-
name: windows-1809
118-
119-
platform:
120-
os: windows
121-
arch: amd64
122-
version: 1809
123-
124-
steps:
125-
- name: publish-hyperkube-windows-1809
126-
image: plugins/docker
127-
settings:
128-
username:
129-
from_secret: docker_username
130-
password:
131-
from_secret: docker_password
132-
dockerfile: Dockerfile.windows
133-
repo: rancher/hyperkube
134-
tag: "${DRONE_TAG}-windows-1809"
135-
build_args:
136-
- SERVERCORE_VERSION=1809
137-
volumes:
138-
- name: docker_pipe
139-
path: \\\\.\\pipe\\docker_engine
140-
when:
141-
instance:
142-
- drone-publish.rancher.io
143-
event:
144-
- tag
145-
146-
volumes:
147-
- name: docker_pipe
148-
host:
149-
path: \\\\.\\pipe\\docker_engine
150-
---
151-
kind: pipeline
152-
name: windows-20H2-pr
153-
154-
platform:
155-
os: windows
156-
arch: amd64
157-
version: 20H2
158-
159-
# remove this and use upstream images when https://github.com/drone/drone-git/pull/25 is merged
160-
clone:
161-
disable: true
162-
163-
steps:
164-
- name: clone
165-
image: rancher/drone-images:git-20H2
166-
- name: hyperkube-windows-20H2-pr
167-
image: rancher/dapper:v0.5.7
168-
commands:
169-
- "docker build -f Dockerfile.windows.20H2 --build-arg SERVERCORE_VERSION=20H2 ."
170-
volumes:
171-
- name: docker_pipe
172-
path: \\\\.\\pipe\\docker_engine
173-
when:
174-
event:
175-
- pull_request
176-
177-
volumes:
178-
- name: docker_pipe
179-
host:
180-
path: \\\\.\\pipe\\docker_engine
181-
182-
---
183-
kind: pipeline
184-
name: windows-20H2
185-
186-
platform:
187-
os: windows
188-
arch: amd64
189-
version: 20H2
190-
191-
# remove this and use upstream images when https://github.com/drone/drone-git/pull/25 is merged
192-
clone:
193-
disable: true
194-
195-
steps:
196-
- name: clone
197-
image: rancher/drone-images:git-20H2
198-
- name: publish-hyperkube-windows-20H2
199-
image: rancher/drone-images:docker-20H2
200-
settings:
201-
username:
202-
from_secret: docker_username
203-
password:
204-
from_secret: docker_password
205-
dockerfile: Dockerfile.windows.20H2
206-
repo: rancher/hyperkube
207-
tag: "${DRONE_TAG}-windows-20H2"
208-
build_args:
209-
- SERVERCORE_VERSION=20H2
210-
volumes:
211-
- name: docker_pipe
212-
path: \\\\.\\pipe\\docker_engine
213-
when:
214-
instance:
215-
- drone-publish.rancher.io
216-
event:
217-
- tag
218-
219-
volumes:
220-
- name: docker_pipe
221-
host:
222-
path: \\\\.\\pipe\\docker_engine
223-
---
224-
kind: pipeline
22591
name: manifest
22692

22793
steps:
@@ -241,8 +107,6 @@ steps:
241107
depends_on:
242108
- linux-amd64
243109
- linux-arm64
244-
- windows-1809
245-
- windows-20H2
246110

247111
---
248112

Dockerfile.windows

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

Dockerfile.windows.20H2

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

manifest.tmpl

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,3 @@ manifests:
1010
platform:
1111
architecture: arm64
1212
os: linux
13-
-
14-
image: rancher/hyperkube:{{build.tag}}-windows-1809
15-
platform:
16-
architecture: amd64
17-
os: windows
18-
version: 1809
19-
-
20-
image: rancher/hyperkube:{{build.tag}}-windows-20H2
21-
platform:
22-
architecture: amd64
23-
os: windows
24-
version: 20H2

0 commit comments

Comments
 (0)