From 90808ae54494b0b37e3375639b1a8dc8d5677ff9 Mon Sep 17 00:00:00 2001 From: Josh Ghiloni Date: Wed, 22 Jan 2020 14:20:57 -0700 Subject: [PATCH 1/4] Update cflocal to use cflinuxfs3 --- .appveyor.yml | 2 +- README.md | 2 +- cf/cmd/cmd.go | 6 +++--- fixtures/env.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 5576cb5..b26308a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -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 diff --git a/README.md b/README.md index a785460..b934570 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/cf/cmd/cmd.go b/cf/cmd/cmd.go index 0917f32..6504b49 100644 --- a/cf/cmd/cmd.go +++ b/cf/cmd/cmd.go @@ -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 { diff --git a/fixtures/env.go b/fixtures/env.go index 5151f77..02951ac 100644 --- a/fixtures/env.go +++ b/fixtures/env.go @@ -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), From 09403ea6a59cea0289a273fc31461067d6af0f31 Mon Sep 17 00:00:00 2001 From: Josh Ghiloni Date: Thu, 23 Jan 2020 12:20:04 -0700 Subject: [PATCH 2/4] Pin forge commit --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a5c19a6..d1f3b75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ install: - chmod +x "$GOPATH/bin/dep" - dep ensure - go get github.com/buildpack/forge -- ( cd "$GOPATH/src/github.com/buildpack/forge" && dep ensure ) +- ( 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))" From 5f7399cc2eb553aaf72c9a93d52b31f2e7ad182f Mon Sep 17 00:00:00 2001 From: Josh Ghiloni Date: Thu, 23 Jan 2020 12:30:28 -0700 Subject: [PATCH 3/4] use git clone instead of go get to get forge version --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d1f3b75..fae1b26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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" && git checkout 54ae137 && dep ensure ) +- ( mkdir -p "$GOPATH/src/github.com/buildpack/forge" && git clone -b 54ae137 https://github.com/buildpack/forge "$GOPATH/src/github.com/buildpack/forge" ) +- ( cd "$GOPATH/src/github.com/buildpack/forge" && 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))" From 5e77d4ede1881174a0d75c5bc3cae108701475fa Mon Sep 17 00:00:00 2001 From: Josh Ghiloni Date: Thu, 23 Jan 2020 12:49:57 -0700 Subject: [PATCH 4/4] fix clone --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fae1b26..1e4bd67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 -- ( mkdir -p "$GOPATH/src/github.com/buildpack/forge" && git clone -b 54ae137 https://github.com/buildpack/forge "$GOPATH/src/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))"