Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update builders from bionic -> jammy #625

Merged
merged 2 commits into from
Sep 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test-all-samples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:

- name: Test ${{ matrix.suite }}
run: |
./scripts/smoke.sh --builder paketobuildpacks/builder:full --suite ${{ matrix.suite }}
./scripts/smoke.sh --builder paketobuildpacks/builder-jammy-full:latest --suite ${{ matrix.suite }}

- name: File Issue
if: ${{ failure() && github.event_name != 'pull_request' }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-pull-request-ca-certificates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ jobs:
- name: Test ca-certificates Samples
run: |
./scripts/smoke.sh --suite ca-certificates \
--builder paketobuildpacks/builder:full \
--builder paketobuildpacks/builder:base \
--builder paketobuildpacks/builder:tiny
--builder paketobuildpacks/builder-jammy-full:latest \
--builder paketobuildpacks/builder-jammy-base:latest \
--builder paketobuildpacks/builder-jammy-tiny:latest
2 changes: 0 additions & 2 deletions .github/workflows/test-pull-request-dotnet-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ jobs:
max-parallel: 3
matrix:
builder:
- 'paketobuildpacks/builder:full'
- 'paketobuildpacks/builder:base'
- 'paketobuildpacks/builder-jammy-base:latest'
- 'paketobuildpacks/builder-jammy-full:latest'
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-pull-request-git.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ jobs:
- name: Test git Samples
run: |
./scripts/smoke.sh --suite git \
--builder paketobuildpacks/builder:full \
--builder paketobuildpacks/builder:base
--builder paketobuildpacks/builder-jammy-full:latest \
--builder paketobuildpacks/builder-jammy-base:latest
3 changes: 0 additions & 3 deletions .github/workflows/test-pull-request-go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ jobs:
max-parallel: 3
matrix:
builder:
- 'paketobuildpacks/builder:full'
- 'paketobuildpacks/builder:base'
- 'paketobuildpacks/builder:tiny'
- 'paketobuildpacks/builder-jammy-full:latest'
- 'paketobuildpacks/builder-jammy-base:latest'
- 'paketobuildpacks/builder-jammy-tiny:latest'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-pull-request-java-native-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ jobs:
- name: Test Java Native Image Samples
run: |
./scripts/smoke.sh --suite java/native-image \
--builder paketobuildpacks/builder:full \
--builder paketobuildpacks/builder:base \
--builder paketobuildpacks/builder:tiny
--builder paketobuildpacks/builder-jammy-full:latest \
--builder paketobuildpacks/builder-jammy-base:latest \
--builder paketobuildpacks/builder-jammy-tiny:latest
4 changes: 2 additions & 2 deletions .github/workflows/test-pull-request-java-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@ jobs:
- name: Test Java-Node Samples
run: |
./scripts/smoke.sh --suite java/java-node \
--builder paketobuildpacks/builder:full \
--builder paketobuildpacks/builder:base \
--builder paketobuildpacks/builder-jammy-full:latest \
--builder paketobuildpacks/builder-jammy-base:latest \
6 changes: 3 additions & 3 deletions .github/workflows/test-pull-request-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@ jobs:
- name: Test Java Samples
run: |
./scripts/smoke.sh --suite java \
--builder paketobuildpacks/builder:full \
--builder paketobuildpacks/builder:base \
--builder paketobuildpacks/builder:tiny
--builder paketobuildpacks/builder-jammy-full:latest \
--builder paketobuildpacks/builder-jammy-base:latest \
--builder paketobuildpacks/builder-jammy-tiny:latest
2 changes: 0 additions & 2 deletions .github/workflows/test-pull-request-nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ jobs:
max-parallel: 3
matrix:
builder:
- 'paketobuildpacks/builder:full'
- 'paketobuildpacks/builder:base'
- 'paketobuildpacks/builder-jammy-full:latest'
- 'paketobuildpacks/builder-jammy-base:latest'
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-pull-request-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ jobs:
- name: Test PHP Samples
run: |
./scripts/smoke.sh --suite php \
--builder paketobuildpacks/builder:full
--builder paketobuildpacks/builder-jammy-full:latest
4 changes: 2 additions & 2 deletions .github/workflows/test-pull-request-procfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ jobs:
- name: Test Procfile Samples
run: |
./scripts/smoke.sh --suite procfile \
--builder paketobuildpacks/builder:full \
--builder paketobuildpacks/builder:base
--builder paketobuildpacks/builder-jammy-full:latest \
--builder paketobuildpacks/builder-jammy-base:latest
2 changes: 0 additions & 2 deletions .github/workflows/test-pull-request-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ jobs:
max-parallel: 3
matrix:
builder:
- 'paketobuildpacks/builder:full'
- 'paketobuildpacks/builder:base'
- 'paketobuildpacks/builder-jammy-full:latest'
- 'paketobuildpacks/builder-jammy-base:latest'
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-pull-request-ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ jobs:
- name: Test Ruby Samples
run: |
./scripts/smoke.sh --suite ruby \
--builder paketobuildpacks/builder:full \
--builder paketobuildpacks/builder:base
--builder paketobuildpacks/builder-jammy-full:latest \
--builder paketobuildpacks/builder-jammy-base:latest
4 changes: 2 additions & 2 deletions .github/workflows/test-pull-request-web-servers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ jobs:
- name: Test Web Servers Samples
run: |
./scripts/smoke.sh --suite web-servers \
--builder paketobuildpacks/builder:full \
--builder paketobuildpacks/builder:base
--builder paketobuildpacks/builder-jammy-full:latest \
--builder paketobuildpacks/builder-jammy-base:latest
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ To run integration tests that `pack build` each of the sample apps, use
For example, to run tests for the Go and .NET Core samples with the Paketo tiny
and base builders, run:
```
./smoke.sh --builder paketobuildpacks/builder:tiny \
--builder paketobuildpacks/builder:base \
./smoke.sh --builder paketobuildpacks/builder-jammy-tiny:latest \
--builder paketobuildpacks/builder-jammy-base:latest \
--suite go \
--suite dotnet-core
```
4 changes: 2 additions & 2 deletions ca-certificates/ca-certificates-sample/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ This sample contains a simple buildpack that will use curl to make a `HEAD` requ
Build the sample application with the sample buildpack and set `$BP_TEST_URL` to your URL in the build environment.
```bash
pack build applications/ca-certificates \
--builder paketobuildpacks/builder:full \
--builder paketobuildpacks/builder-jammy-full:latest \
--buildpack ./buildpack \
--buildpack paketo-buildpacks/go \
--volume "$(pwd)/binding:/platform/bindings/ca-certificates" \
--env BP_TEST_URL=<url>
```

The builder `paketobuildpacks/builder:full` is required in the above command because the full stack provides `curl`.
The builder `paketobuildpacks/builder-jammy-full:latest` is required in the above command because the full stack provides `curl`.
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ api = "0.4"
name = "Paketo Sample CA Certficate Tester"

[[stacks]]
id = "io.buildpacks.stacks.bionic"
id = "*"
2 changes: 1 addition & 1 deletion ca-certificates/ca-certificates_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestCACertificates(t *testing.T) {
suite := spec.New("CACertificates", spec.Parallel(), spec.Report(report.Terminal{}))
for _, builder := range builders {
suite(fmt.Sprintf("CACertificates with %s builder", builder), testCACertificatesRun(builder))
if builder == "paketobuildpacks/builder:full" {
if builder == "paketobuildpacks/builder-jammy-full:latest" {
suite(fmt.Sprintf("CACertificates with %s builder", builder), testCACertificatesBuild(builder))
}
}
Expand Down
3 changes: 0 additions & 3 deletions scripts/.util/test-workflow-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ jobs:
max-parallel: 3
matrix:
builder:
- 'paketobuildpacks/builder:full'
- 'paketobuildpacks/builder:base'
- 'paketobuildpacks/builder:tiny'
- 'paketobuildpacks/builder-jammy-full:latest'
- 'paketobuildpacks/builder-jammy-base:latest'
- 'paketobuildpacks/builder-jammy-tiny:latest'
Expand Down
4 changes: 2 additions & 2 deletions scripts/smoke.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ function main() {
fi

if [[ ! ${builderArray[@]+"${builderArray[@]}"} ]]; then
builderArray+=("paketobuildpacks/builder:full")
util::print::info "No builder specified. Running with full builder (paketobuildpacks/builder:full)"
builderArray+=("paketobuildpacks/builder-jammy-full:latest")
util::print::info "No builder specified. Running with jammy full builder (paketobuildpacks/builder-jammy-full:latest)"
fi

if [[ ! ${suiteArray[@]+"${suiteArray[@]}"} ]]; then
Expand Down
3 changes: 2 additions & 1 deletion web-servers/httpd-sample/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
## Building

```bash
pack build my-httpd-app --buildpack paketo-buildpacks/httpd --builder paketobuildpacks/builder:full
pack build my-httpd-app --buildpack paketo-buildpacks/httpd --builder paketobuildpacks/builder-jammy-full:latest

```

## Running
Expand Down
2 changes: 1 addition & 1 deletion web-servers/httpd-sample/httpd.conf
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ LogLevel info
</IfModule>

<IfModule !mpm_netware_module>
PidFile "logs/httpd.pid"
PidFile "/tmp/httpd.pid"
</IfModule>
<IfModule mpm_worker_module>
StartServers 3
Expand Down
10 changes: 5 additions & 5 deletions web-servers/no-config-file-sample/HTTPD.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ your application the build process must have `BP_WEB_SERVER` set to `httpd`.
```bash
pack build httpd-no-config --path app \
--buildpack paketo-buildpacks/httpd \
--builder paketobuildpacks/builder:full \
--builder paketobuildpacks/builder-jammy-full:latest \
--env BP_WEB_SERVER=httpd
```

Expand Down Expand Up @@ -43,7 +43,7 @@ to `htdocs`.
mv app/public app/htdocs && \
pack build httpd-custom-root --path app \
--buildpack paketo-buildpacks/httpd \
--builder paketobuildpacks/builder:full \
--builder paketobuildpacks/builder-jammy-full:latest \
--env BP_WEB_SERVER=httpd \
--env BP_WEB_SERVER_ROOT=htdocs \
&& mv app/htdocs app/public
Expand Down Expand Up @@ -74,7 +74,7 @@ static file structure.
```bash
pack build httpd-push-state --path app \
--buildpack paketo-buildpacks/httpd \
--builder paketobuildpacks/builder:full \
--builder paketobuildpacks/builder-jammy-full:latest \
--env BP_WEB_SERVER=httpd \
--env BP_WEB_SERVER_ENABLE_PUSH_STATE=true
```
Expand Down Expand Up @@ -103,7 +103,7 @@ the server to be redirected using the HTTPS protocol.
```bash
pack build httpd-force-https --path app \
--buildpack paketo-buildpacks/httpd \
--builder paketobuildpacks/builder:full \
--builder paketobuildpacks/builder-jammy-full:latest \
--env BP_WEB_SERVER=httpd \
--env BP_WEB_SERVER_FORCE_HTTPS=true
```
Expand Down Expand Up @@ -144,7 +144,7 @@ tool that is an httdp utility was used. For sample purposes the user added was
```bash
pack build httpd-basic-auth --path app \
--buildpack paketo-buildpacks/httpd \
--builder paketobuildpacks/builder:full \
--builder paketobuildpacks/builder-jammy-full:latest \
--volume "$(pwd)/binding:/bindings/auth" \
--env BP_WEB_SERVER=httpd \
--env SERVICE_BINDING_ROOT=/bindings
Expand Down
10 changes: 5 additions & 5 deletions web-servers/no-config-file-sample/NGINX.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ an NGINX server that starts as PID 1 in the app container.

```bash
pack build nginx-no-config --path app \
--builder paketobuildpacks/builder:base \
--builder paketobuildpacks/builder-jammy-base:latest \
--env BP_WEB_SERVER=nginx
```

Expand Down Expand Up @@ -41,7 +41,7 @@ and see that the server serves the other version of `index.html`.

```bash
pack build nginx-custom-root --path app \
--builder paketobuildpacks/builder:base \
--builder paketobuildpacks/builder-jammy-base:latest \
--env BP_WEB_SERVER=nginx \
--env BP_WEB_SERVER_ROOT=alternate \
```
Expand Down Expand Up @@ -72,7 +72,7 @@ static file structure.

```bash
pack build nginx-push-state --path app \
--builder paketobuildpacks/builder:base \
--builder paketobuildpacks/builder-jammy-base:latest \
--env BP_WEB_SERVER=nginx \
--env BP_WEB_SERVER_ENABLE_PUSH_STATE=true
```
Expand Down Expand Up @@ -100,7 +100,7 @@ the server to be redirected using the HTTPS protocol.

```bash
pack build nginx-force-https --path app \
--builder paketobuildpacks/builder:base \
--builder paketobuildpacks/builder-jammy-base:latest \
--env BP_WEB_SERVER=nginx \
--env BP_WEB_SERVER_FORCE_HTTPS=true
```
Expand Down Expand Up @@ -141,7 +141,7 @@ The username is `user`, password is `password`.

```bash
pack build nginx-basic-auth --path app \
--builder paketobuildpacks/builder:base \
--builder paketobuildpacks/builder-jammy-base:latest \
--volume "$(pwd)/binding:/bindings/auth" \
--env BP_WEB_SERVER=nginx \
--env SERVICE_BINDING_ROOT=/bindings
Expand Down
Loading