Skip to content
This repository has been archived by the owner on Jan 28, 2022. It is now read-only.

Commit

Permalink
Merge pull request #39 from jghiloni/master
Browse files Browse the repository at this point in the history
Update cflocal to use cflinuxfs3
  • Loading branch information
sclevine authored Jan 23, 2020
2 parents aaf6034 + 5e77d4e commit d86cb24
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ install:
- choco install docker-machine
#- docker-machine create -d virtualbox --virtualbox-no-vtx-check --virtualbox-nat-nictype "Am79C973" --virtualbox-hostonly-nictype "Am79C973" default
#- docker-machine env --shell powershell default | iex
#- docker run -it --rm cloudfoundry/cflinuxfs2 ls
#- docker run -it --rm cloudfoundry/cflinuxfs3 ls
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ install:
- curl -fsSLo "$GOPATH/bin/dep" "https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64"
- chmod +x "$GOPATH/bin/dep"
- dep ensure
- go get github.com/buildpack/forge
- ( cd "$GOPATH/src/github.com/buildpack/forge" && dep ensure )
- ( mkdir -p "$GOPATH/src/github.com/buildpack/forge" && git clone https://github.com/buildpack/forge "$GOPATH/src/github.com/buildpack/forge" )
- ( cd "$GOPATH/src/github.com/buildpack/forge" && git checkout 54ae137 && dep ensure )
- curl -fsSL "https://cli.run.pivotal.io/stable?release=linux64-binary" | tar -C "$GOPATH/bin" -xz cf
script:
- test -z "$(bin/format | tee >(cat >&2))"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Notably, CF Local:
* Does not require the Docker CLI
* Can run against a remote Docker daemon
* Uses the latest official Cloud Foundry buildpack releases by default
* Always uses the latest Cloud Foundry rootfs (cflinuxfs2) release
* Always uses the latest Cloud Foundry rootfs (cflinuxfs3) release
* Includes multi-buildpack support
* Supports specifying buildpacks by name, zip URL, git URL, and local zip path

Expand Down
6 changes: 3 additions & 3 deletions cf/cmd/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
)

const (
RunStack = "packs/cflinuxfs2:run"
BuildStack = "packs/cflinuxfs2:build"
NetworkStack = "packs/cflinuxfs2:network"
RunStack = "packs/cflinuxfs3:run"
BuildStack = "packs/cflinuxfs3:build"
NetworkStack = "packs/cflinuxfs3:network"
)

type UI interface {
Expand Down
2 changes: 1 addition & 1 deletion fixtures/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func stagingEnv(name string, mem int64, service string) map[string]string {
"CF_INSTANCE_IP": ipv4Regexp,
"CF_INSTANCE_PORT": "",
"CF_INSTANCE_PORTS": qm("[]"),
"CF_STACK": "cflinuxfs2",
"CF_STACK": "cflinuxfs3",
"HOME": "/home/vcap",
"LANG": qm("en_US.UTF-8"),
"MEMORY_LIMIT": fmt.Sprintf("%dm", mem),
Expand Down

0 comments on commit d86cb24

Please sign in to comment.