Skip to content

Commit 79c3958

Browse files
dwillistDaniel Mikusa
and
Daniel Mikusa
committed
initial refactor of httpd buildpack to php buildpack
[#162492378] Co-authored-by: Daniel Mikusa <dmikusa@pivotal.io>
0 parents  commit 79c3958

23 files changed

+858
-0
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.DS_Store
2+
.idea
3+
.bin

CONTRIBUTING.md

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Contributing
2+
3+
## Contributing Guidelines
4+
5+
All pull request authors must have a Contributor License Agreement (CLA) on-file with us. Please sign the appropriate CLA ([individual](http://cloudfoundry.org/pdfs/CFF_Individual_CLA.pdf) or [corporate](http://cloudfoundry.org/pdfs/CFF_Corporate_CLA.pdf)).
6+
7+
When sending signed CLA please provide your github username in case of individual CLA or the list of github usernames that can make pull requests on behalf of your organization.
8+
9+
If you are confident that you're covered under a Corporate CLA, please make sure you've publicized your membership in the appropriate Github Org, per these instructions.
10+
11+
## Run the tests
12+
13+
TBD
14+
15+
## Pull Requests
16+
17+
1. Fork the project
18+
1. Submit a pull request
19+
20+
Please include integration tests (in `integration`) and corresponding fixtures (in `fixtures`) where necessary to cover any functionality that is introduced.
21+
22+
**NOTE:** When submitting a pull request, *please make sure to target the `develop` branch*, so that your changes are up-to-date and easy to integrate with the most recent work on the buildpack. Thanks!

ISSUE_TEMPLATE

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
What version of Cloud Foundry and CF CLI are you using? (i.e. What is the output of running `cf curl /v2/info && cf version`?
2+
3+
4+
What version of the buildpack you are using?
5+
6+
7+
If you were attempting to accomplish a task, what was it you were attempting to do?
8+
9+
10+
What did you expect to happen?
11+
12+
13+
What was the actual behavior?
14+
15+
16+
Can you provide a sample app?
17+
18+
19+
Please confirm where necessary:
20+
* [ ] I have included a log output
21+
* [ ] My log includes an error message
22+
* [ ] I have included steps for reproduction

LICENSE

+201
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

NOTICE

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Copyright (c) 2018-Present CloudFoundry.org Foundation, Inc. All Rights Reserved.
2+
3+
This project is licensed to you under the Apache License, Version 2.0 (the "License").
4+
You may not use this project except in compliance with the License.
5+
6+
This project may include a number of subcomponents with separate copyright notices
7+
and license terms. Your use of these subcomponents is subject to the terms and
8+
conditions of the subcomponent's license, as noted in the LICENSE file.

PULL_REQUEST_TEMPLATE

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Thanks for contributing to the buildpack. To speed up the process of reviewing your pull request please provide us with:
2+
3+
* A short explanation of the proposed change:
4+
5+
* An explanation of the use cases your change solves
6+
7+
* [ ] I have viewed signed and have submitted the Contributor License Agreement
8+
9+
* [ ] I have made this pull request to the `develop` branch
10+
11+
* [ ] I have added an integration test

README.md

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# PHP Cloud Native Buildpack
2+
3+
## Usage
4+
5+
To package this buildpack for consumption:
6+
7+
```
8+
$ ./scripts/package.sh
9+
```
10+
11+
This builds the buildpack's Go source using `GOOS=linux` by default. You can supply another value as the first argument to `package.sh`.

buildpack.toml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
2+
[buildpack]
3+
id = "org.cloudfoundry.buildpacks.php"
4+
name = "PHP Buildpack"
5+
version = "0.0.1"
6+
7+
[[metadata.dependencies]]
8+
id = "php"
9+
name = "PHP Buildpack"
10+
sha256 = "fe179853efe050a800d1789189dc2fdbf969ae1fb872032da71045b5bf9be777"
11+
stacks = ["org.cloudfoundry.stacks.cflinuxfs2"]
12+
uri = "https://buildpacks.cloudfoundry.org/dependencies/php/php7-7.2.13-linux-x64-cflinuxfs2-fe179853.tgz"
13+
version = "7.2.13"
14+
15+
[[metadata.dependencies]]
16+
id = "php"
17+
name = "PHP Buildpack"
18+
sha256 = "fb2e6e50f30859fd275b92807fffd15eae032d8ad0a2779ce87775b9f30b2611"
19+
stacks = ["org.cloudfoundry.stacks.cflinuxfs3"]
20+
uri = "https://buildpacks.cloudfoundry.org/dependencies/php/php7-7.2.13-linux-x64-cflinuxfs3-fb2e6e50.tgz"
21+
version = "7.2.13"
22+
23+
[[stacks]]
24+
id = "org.cloudfoundry.stacks.cflinuxfs3"
25+
26+
[[stacks]]
27+
id = "org.cloudfoundry.stacks.cflinuxfs2"
28+
29+
[[stacks]]
30+
id = "io.buildpacks.stacks.bionic"

cmd/build/main.go

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
package main
2+
3+
import (
4+
"fmt"
5+
"github.com/cloudfoundry/php-cnb/php"
6+
"os"
7+
8+
"github.com/buildpack/libbuildpack/buildplan"
9+
10+
"github.com/cloudfoundry/libcfbuildpack/build"
11+
)
12+
13+
func main() {
14+
buildContext, err := build.DefaultBuild()
15+
if err != nil {
16+
_, _ = fmt.Fprintf(os.Stderr, "failed to build: %s", err)
17+
os.Exit(101)
18+
}
19+
20+
code, err := runBuild(buildContext)
21+
if err != nil {
22+
buildContext.Logger.Info(err.Error())
23+
}
24+
25+
os.Exit(code)
26+
27+
}
28+
29+
func runBuild(context build.Build) (int, error) {
30+
context.Logger.FirstLine(context.Logger.PrettyIdentity(context.Buildpack))
31+
32+
contributor, willContribute, err := php.NewContributor(context)
33+
if err != nil {
34+
return context.Failure(102), err
35+
}
36+
37+
if willContribute {
38+
err := contributor.Contribute()
39+
if err != nil {
40+
return context.Failure(103), err
41+
}
42+
}
43+
44+
return context.Success(buildplan.BuildPlan{})
45+
}

cmd/build/main_test.go

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package main
2+
3+
import (
4+
"github.com/cloudfoundry/libcfbuildpack/test"
5+
"testing"
6+
7+
. "github.com/onsi/gomega"
8+
"github.com/sclevine/spec"
9+
"github.com/sclevine/spec/report"
10+
)
11+
12+
func TestUnitBuild(t *testing.T) {
13+
RegisterTestingT(t)
14+
spec.Run(t, "Build", testBuild, spec.Report(report.Terminal{}))
15+
}
16+
17+
func testBuild(t *testing.T, _ spec.G, it spec.S) {
18+
it("always fails", func() { //TOOD: update this when this build things
19+
20+
21+
f := test.NewBuildFactory(t)
22+
23+
code, err := runBuild(f.Build)
24+
Expect(err).NotTo(HaveOccurred())
25+
26+
Expect(code).To(Equal(1))
27+
28+
})
29+
}

0 commit comments

Comments
 (0)