Add Windows builder and buildpacks #85
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Closes #53 |
micahyoung
force-pushed
the
windows-builder-and-bps
branch
2 times, most recently
from
bb6c0d0
to
7b5438b
Compare
micahyoung
force-pushed
the
windows-builder-and-bps
branch
from
7b5438b
to
0461571
Compare
micahyoung
force-pushed
the
windows-builder-and-bps
branch
4 times, most recently
from
6b0b061
to
0022039
Compare
- Change to pack flags to new syntax Signed-off-by: Micah Young <ymicah@vmware.com>
- Add Makefile targets for Windows - Fix ASCII art bin bash-app - Change stack to use ContainerUser (avoid permissions issues on k8s and docker) Signed-off-by: Micah Young <ymicah@vmware.com>
Signed-off-by: Micah Young <ymicah@vmware.com>
- tar up buildpacks when make runs on Windows Signed-off-by: Micah Young <ymicah@vmware.com>
Signed-off-by: Javier Romero <rjavier@vmware.com>
- missing path option Signed-off-by: Micah Young <ymicah@vmware.com>
Signed-off-by: Micah Young <ymicah@vmware.com>
- Add missing PATH env var to run image so that it gets properly set in app images - Can be removed once buildpacks/pack#800 is resolved Signed-off-by: Micah Young <ymicah@vmware.com>
Signed-off-by: Micah Young <ymicah@vmware.com>
Signed-off-by: Micah Young <ymicah@vmware.com>
Signed-off-by: Micah Young <ymicah@vmware.com>
- Workaround for missing Windows pack support for directory-based buildpacks - Pivot samples-root to a temp path with tgz-buildpacks of the same name Signed-off-by: Micah Young <ymicah@vmware.com>
micahyoung
force-pushed
the
windows-builder-and-bps
branch
from
8d3d888
to
ef63fb5
Compare
micahyoung
commented
Aug 20, 2020
| - uses: azure/docker-login@v1 | ||
| if: github.event_name == 'push' && github.ref == 'refs/heads/main' |
There was a problem hiding this comment.
I had to gate this so it would pass on my repo branch which doesn't have a valid secret.
I also moved the step below Build so make build-*, which is usually more likely to fail than docker login, happen sooner.
| @@ -6,7 +6,7 @@ PACK_CMD?=pack | |||
| ## Linux | |||
| #################### | |||
|
|
|||
| build-linux: build-linux-stacks build-packages build-builders build-buildpacks | |||
| build-linux: build-linux-stacks build-linux-packages build-linux-builders build-linux-buildpacks | |||
There was a problem hiding this comment.
I moved all Linux targets that don't have alpine or bionic to have the linux in the name
Comment on lines
+207
to
+221
| ifeq ($(OS),Windows_NT) | ||
| SAMPLES_ROOT:=$(shell mkdir -p .tmp && mktemp --directory -p . .tmp/samples-XXX) | ||
| build-sample-root: | ||
| @mkdir -p $(SAMPLES_ROOT)/buildpacks/ | ||
|
|
||
| @for bp_dir in ./buildpacks/*/; do \ | ||
| tar -czf $(SAMPLES_ROOT)/buildpacks/$$(basename $$bp_dir) -C $$bp_dir . ; \ | ||
| done | ||
|
|
||
| @cp -r builders packages $(SAMPLES_ROOT)/ | ||
| else | ||
| # No-op for posix pack | ||
| SAMPLES_ROOT:=. | ||
| build-sample-root: | ||
| endif |
There was a problem hiding this comment.
This makes build-linux- targets work for LCOW for anyone using bash.exe, and also let's build-windows- targets work for WCOW (if they are run from a Mac using DOCKER_HOST, this branch is not used).
This can all be removed once directory buildpacks are supported for pack on Windows.
| RUN net users /ADD cnb /passwordreq:no /expires:never | ||
| # non-zero sets all user-owned directories to BUILTIN\Users | ||
| ARG cnb_uid=1 | ||
| ARG cnb_gid=1 | ||
|
|
||
| ENV CNB_USER_ID=${cnb_uid} |
There was a problem hiding this comment.
These vars are only needed in the build image, according to the spec
There was a problem hiding this comment.
Merged
micahyoung
force-pushed
the
windows-builder-and-bps
branch
from
84b9a20
to
80bd014
Compare
micahyoung
force-pushed
the
windows-builder-and-bps
branch
from
80bd014
to
da4115f
Compare
Signed-off-by: Micah Young <ymicah@vmware.com>
micahyoung
force-pushed
the
windows-builder-and-bps
branch
from
da4115f
to
cc1684c
Compare
natalieparellano
approved these changes
Aug 21, 2020
jromero
approved these changes
Aug 24, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds:
buildpacks/hello-world-windows.batclone ofhello-worldnanoserver-1809buildpacks/hello-world-windows.batclone ofbash-script.batclone ofbash-script-buildpackAdditional:
bash-scriptapp ASCII artKnown issues:
Signed-off-by: Micah Young ymicah@vmware.com