Skip to content

Commit b35a928

Browse files
AidanDelaneyAidanDelaney
authored
Merge pull request #190 from buildpacks/feat/bump-ubuntu-noble
Update to latest Ubuntu LTS
2 parents 7e3d07e + 80c8234 commit b35a928

File tree

19 files changed

+66
-66
lines changed

19 files changed

+66
-66
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ workflows:
1010
executor-image: ubuntu-2204:2023.04.2
1111
working-directory: apps/java-maven
1212
image-name: cnbs/circleci-sample
13-
builder: 'cnbs/sample-builder:jammy'
13+
builder: 'cnbs/sample-builder:noble'
1414
version: '0.32.1'
1515
- test:
1616
requires:

‎Makefile

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,33 @@ clean: clean-linux clean-windows
1010

1111
build-linux: build-linux-bases build-linux-packages build-linux-builders build-linux-buildpacks
1212

13-
build-linux-bases: build-base-alpine build-base-jammy
13+
build-linux-bases: build-base-alpine build-base-noble
1414

1515
build-alpine: build-base-alpine build-builder-alpine build-buildpacks-alpine
1616

17-
build-jammy: build-base-jammy build-builder-jammy build-buildpacks-jammy
17+
build-noble: build-base-noble build-builder-noble build-buildpacks-noble
1818

1919
build-base-alpine:
2020
@echo "> Building 'alpine' base images..."
2121
${PACK_CMD} config experimental true
2222
bash base-images/build.sh alpine
2323

24-
build-base-jammy:
25-
@echo "> Building 'jammy' base images..."
24+
build-base-noble:
25+
@echo "> Building 'noble' base images..."
2626
${PACK_CMD} config experimental true
27-
bash base-images/build.sh jammy
27+
bash base-images/build.sh noble
2828

29-
build-linux-builders: build-builder-alpine build-builder-jammy
29+
build-linux-builders: build-builder-alpine build-builder-noble
3030

3131
build-builder-alpine: build-linux-packages build-sample-root
3232
@echo "> Building 'alpine' builder..."
3333
$(PACK_CMD) builder create cnbs/sample-builder:alpine --config $(SAMPLES_ROOT)/builders/alpine/builder.toml $(PULL_POLICY_NEVER)
3434

35-
build-builder-jammy: build-linux-packages build-sample-root
36-
@echo "> Building 'jammy' builder..."
37-
$(PACK_CMD) builder create cnbs/sample-builder:jammy --config $(SAMPLES_ROOT)/builders/jammy/builder.toml $(PULL_POLICY_NEVER)
35+
build-builder-noble: build-linux-packages build-sample-root
36+
@echo "> Building 'noble' builder..."
37+
$(PACK_CMD) builder create cnbs/sample-builder:noble --config $(SAMPLES_ROOT)/builders/noble/builder.toml $(PULL_POLICY_NEVER)
3838

39-
build-linux-buildpacks: build-buildpacks-alpine build-buildpacks-jammy
39+
build-linux-buildpacks: build-buildpacks-alpine build-buildpacks-noble
4040

4141
build-buildpacks-alpine: build-sample-root
4242
@echo "> Starting local registry to store alpine builder (when builder contains extensions it must exist in a registry so that builds can use --pull-policy=always and we don't want to override the locally built builder)"
@@ -60,24 +60,24 @@ build-buildpacks-alpine: build-sample-root
6060
@echo "> Creating 'kotlin-gradle' app using 'alpine' builder..."
6161
$(PACK_CMD) build sample-kotlin-gradle-app:alpine -v --builder localhost:5000/cnbs/sample-builder:alpine --path apps/kotlin-gradle --network=host
6262

63-
build-buildpacks-jammy: build-sample-root
64-
@echo "> Creating 'hello-moon' app using 'jammy' builder..."
65-
$(PACK_CMD) build sample-hello-moon-app:jammy -v --builder cnbs/sample-builder:jammy --buildpack $(SAMPLES_ROOT)/buildpacks/hello-world --buildpack $(SAMPLES_ROOT)/buildpacks/hello-moon $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
63+
build-buildpacks-noble: build-sample-root
64+
@echo "> Creating 'hello-moon' app using 'noble' builder..."
65+
$(PACK_CMD) build sample-hello-moon-app:noble -v --builder cnbs/sample-builder:noble --buildpack $(SAMPLES_ROOT)/buildpacks/hello-world --buildpack $(SAMPLES_ROOT)/buildpacks/hello-moon $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
6666

67-
@echo "> Creating 'hello-processes' app using 'jammy' builder..."
68-
$(PACK_CMD) build sample-hello-processes-app:jammy -v --builder cnbs/sample-builder:jammy --buildpack $(SAMPLES_ROOT)/buildpacks/hello-processes $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
67+
@echo "> Creating 'hello-processes' app using 'noble' builder..."
68+
$(PACK_CMD) build sample-hello-processes-app:noble -v --builder cnbs/sample-builder:noble --buildpack $(SAMPLES_ROOT)/buildpacks/hello-processes $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
6969

70-
@echo "> Creating 'hello-world' app using 'jammy' builder..."
71-
$(PACK_CMD) build sample-hello-world-app:jammy -v --builder cnbs/sample-builder:jammy --buildpack $(SAMPLES_ROOT)/buildpacks/hello-world $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
70+
@echo "> Creating 'hello-world' app using 'noble' builder..."
71+
$(PACK_CMD) build sample-hello-world-app:noble -v --builder cnbs/sample-builder:noble --buildpack $(SAMPLES_ROOT)/buildpacks/hello-world $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
7272

73-
@echo "> Creating 'java-maven' app using 'jammy' builder..."
74-
$(PACK_CMD) build sample-java-maven-app:jammy -v --builder cnbs/sample-builder:jammy --path apps/java-maven $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
73+
@echo "> Creating 'java-maven' app using 'noble' builder..."
74+
$(PACK_CMD) build sample-java-maven-app:noble -v --builder cnbs/sample-builder:noble --path apps/java-maven $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
7575

76-
@echo "> Creating 'kotlin-gradle' app using 'jammy' builder..."
77-
$(PACK_CMD) build sample-kotlin-gradle-app:jammy -v --builder cnbs/sample-builder:jammy --path apps/kotlin-gradle $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
76+
@echo "> Creating 'kotlin-gradle' app using 'noble' builder..."
77+
$(PACK_CMD) build sample-kotlin-gradle-app:noble -v --builder cnbs/sample-builder:noble --path apps/kotlin-gradle $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
7878

79-
@echo "> Creating 'ruby-bundler' app using 'jammy' builder..."
80-
$(PACK_CMD) build sample-ruby-bundler-app:jammy -v --builder cnbs/sample-builder:jammy --path apps/ruby-bundler $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
79+
@echo "> Creating 'ruby-bundler' app using 'noble' builder..."
80+
$(PACK_CMD) build sample-ruby-bundler-app:noble -v --builder cnbs/sample-builder:noble --path apps/ruby-bundler $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
8181

8282
build-linux-packages: build-sample-root
8383
@echo "> Creating 'hello-world' buildpack package"
@@ -94,10 +94,10 @@ deploy-linux-bases:
9494
docker push cnbs/sample-base-run:alpine
9595
docker push cnbs/sample-base-build:alpine
9696

97-
@echo "> Deploying 'jammy' base images..."
98-
docker push cnbs/sample-base:jammy
99-
docker push cnbs/sample-base-run:jammy
100-
docker push cnbs/sample-base-build:jammy
97+
@echo "> Deploying 'noble' base images..."
98+
docker push cnbs/sample-base:noble
99+
docker push cnbs/sample-base-run:noble
100+
docker push cnbs/sample-base-build:noble
101101

102102
deploy-linux-packages:
103103
@echo "> Deploying linux packages..."
@@ -109,23 +109,23 @@ deploy-linux-builders:
109109
docker run cnbs/sample-builder:alpine ls /cnb/extensions/samples_curl || true
110110
docker push cnbs/sample-builder:alpine
111111

112-
@echo "> Deploying 'jammy' builder..."
113-
docker push cnbs/sample-builder:jammy
112+
@echo "> Deploying 'noble' builder..."
113+
docker push cnbs/sample-builder:noble
114114

115115
clean-linux:
116116
@echo "> Removing 'alpine' base images..."
117117
docker rmi cnbs/sample-base:alpine || true
118118
docker rmi cnbs/sample-base-run:alpine || true
119119
docker rmi cnbs/sample-base-build:alpine || true
120120

121-
@echo "> Removing 'jammy' base images..."
122-
docker rmi cnbs/sample-base:jammy || true
123-
docker rmi cnbs/sample-base-run:jammy || true
124-
docker rmi cnbs/sample-base-build:jammy || true
121+
@echo "> Removing 'noble' base images..."
122+
docker rmi cnbs/sample-base:noble || true
123+
docker rmi cnbs/sample-base-run:noble || true
124+
docker rmi cnbs/sample-base-build:noble || true
125125

126126
@echo "> Removing builders..."
127127
docker rmi cnbs/sample-builder:alpine || true
128-
docker rmi cnbs/sample-builder:jammy || true
128+
docker rmi cnbs/sample-builder:noble || true
129129

130130
@echo "> Removing 'alpine' apps..."
131131
docker rmi sample-hello-moon-app:alpine || true
@@ -134,13 +134,13 @@ clean-linux:
134134
docker rmi sample-java-maven-app:alpine || true
135135
docker rmi sample-kotlin-gradle-app:alpine || true
136136

137-
@echo "> Removing 'jammy' apps..."
138-
docker rmi sample-hello-moon-app:jammy || true
139-
docker rmi sample-hello-processes-app:jammy || true
140-
docker rmi sample-hello-world-app:jammy || true
141-
docker rmi sample-java-maven-app:jammy || true
142-
docker rmi sample-kotlin-gradle-app:jammy || true
143-
docker rmi sample-ruby-bundler-app:jammy || true
137+
@echo "> Removing 'noble' apps..."
138+
docker rmi sample-hello-moon-app:noble || true
139+
docker rmi sample-hello-processes-app:noble || true
140+
docker rmi sample-hello-world-app:noble || true
141+
docker rmi sample-java-maven-app:noble || true
142+
docker rmi sample-kotlin-gradle-app:noble || true
143+
docker rmi sample-ruby-bundler-app:noble || true
144144

145145
@echo "> Removing packages..."
146146
docker rmi cnbs/sample-package:hello-world || true

‎apps/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
To build images for most of these apps, simply execute:
1111

1212
```bash
13-
pack build -p apps/<APP> --builder cnbs/sample-builder:<jammy OR alpine> sample-app
13+
pack build -p apps/<APP> --builder cnbs/sample-builder:<noble OR alpine> sample-app
1414
```
1515

1616
_After building the app you should be able to simply run it via `docker run -it -p 8080:8080 sample-app`.

‎apps/bash-script/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pack build sample-bash-script-app --builder cnbs/sample-builder:alpine
1111
OR
1212

1313
```bash
14-
pack build sample-bash-script-app --builder cnbs/sample-builder:jammy
14+
pack build sample-bash-script-app --builder cnbs/sample-builder:noble
1515
```
1616

1717
### Extended Functionality

‎base-images/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Usage:
1717
Example:
1818

1919
```bash
20-
./build-stack.sh jammy
20+
./build-stack.sh noble
2121
```
2222

2323
To use this stack see the [sample builders](../builders)

‎base-images/jammy/base/Dockerfile renamed to ‎base-images/noble/base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:jammy
1+
FROM ubuntu:noble
22

33
# Workaround for docker <= 20.10.9
44
RUN sed -i -e 's/^APT/# APT/' -e 's/^DPkg/# DPkg/' /etc/apt/apt.conf.d/docker-clean

‎base-images/jammy/build/Dockerfile renamed to ‎base-images/noble/build/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ RUN apt update && \
99
COPY ./bin/yj-linux /usr/local/bin/yj
1010

1111
# Create user and group
12-
ARG cnb_uid=1000
13-
ARG cnb_gid=1000
12+
ARG cnb_uid=1001
13+
ARG cnb_gid=1001
1414
RUN groupadd cnb --gid ${cnb_gid} && \
1515
useradd --uid ${cnb_uid} --gid ${cnb_gid} -m -s /bin/bash cnb
1616

‎base-images/jammy/build/bin/yj-linux renamed to ‎base-images/noble/build/bin/yj-linux

File renamed without changes.

‎base-images/jammy/run/Dockerfile renamed to ‎base-images/noble/run/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ ARG base_image
22
FROM ${base_image}
33

44
# Create user and group
5-
ARG cnb_uid=1000
6-
ARG cnb_gid=1000
5+
ARG cnb_uid=1001
6+
ARG cnb_gid=1001
77
RUN groupadd cnb --gid ${cnb_gid} && \
88
useradd --uid ${cnb_uid} --gid ${cnb_gid} -m -s /bin/bash cnb
99

‎builders/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ A sample of builders that use the [base images](../base-images/) in this repo.
44

55
### Contains:
66
- [Alpine](alpine/)
7-
- [Jammy](jammy/)
7+
- [noble](noble/)
88

99
### Additional Resources
1010

‎builders/jammy/README.md renamed to ‎builders/noble/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Sample Jammy Builder
1+
# Sample noble Builder
22

33
### Prerequisites
44
* [Pack](https://buildpacks.io/docs/install-pack/)
@@ -8,13 +8,13 @@
88
#### Creating the builder
99

1010
```bash
11-
pack builder create cnbs/sample-builder:jammy --config builder.toml
11+
pack builder create cnbs/sample-builder:noble --config builder.toml
1212
```
1313

1414
#### Build app with builder
1515

1616
```bash
17-
pack build sample-app --builder cnbs/sample-builder:jammy --path ../../apps/java-maven/
17+
pack build sample-app --builder cnbs/sample-builder:noble --path ../../apps/java-maven/
1818
```
1919

2020
_After building the app you should be able to simply run it via `docker run -it -p 8080:8080 sample-app`.

‎builders/jammy/builder.toml renamed to ‎builders/noble/builder.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ version = "0.0.1"
4040

4141
# Base images used to create the builder
4242
[build]
43-
image = "cnbs/sample-base-build:jammy"
43+
image = "cnbs/sample-base-build:noble"
4444
[run]
4545
[[run.images]]
46-
image = "cnbs/sample-base-run:jammy"
46+
image = "cnbs/sample-base-run:noble"
4747

4848
# Stack (deprecated) used to create the builder
4949
[stack]
50-
id = "io.buildpacks.samples.stacks.jammy"
51-
build-image = "cnbs/sample-base-build:jammy"
52-
run-image = "cnbs/sample-base-run:jammy"
50+
id = "io.buildpacks.samples.stacks.noble"
51+
build-image = "cnbs/sample-base-build:noble"
52+
run-image = "cnbs/sample-base-run:noble"

‎buildpacks/hello-moon/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ pack build sample-hello-moon-app --builder cnbs/sample-builder:alpine --buildpac
1111
OR
1212

1313
```bash
14-
pack build sample-hello-moon-app --builder cnbs/sample-builder:jammy --buildpack ../hello-world/ --buildpack .
14+
pack build sample-hello-moon-app --builder cnbs/sample-builder:noble --buildpack ../hello-world/ --buildpack .
1515
```

‎buildpacks/hello-processes/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pack build sample-hello-processes-app --builder cnbs/sample-builder:alpine --bu
1414
OR
1515

1616
```bash
17-
pack build sample-hello-processes-app --builder cnbs/sample-builder:jammy --buildpack ../java-maven --buildpack . --path ../../apps/java-maven
17+
pack build sample-hello-processes-app --builder cnbs/sample-builder:noble --buildpack ../java-maven --buildpack . --path ../../apps/java-maven
1818
```
1919

2020
#### Run

‎buildpacks/hello-universe/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ OR
1616

1717
```bash
1818
pack build sample-hello-universe-app \
19-
--builder cnbs/sample-builder:jammy \
19+
--builder cnbs/sample-builder:noble \
2020
--buildpack . \
2121
--buildpack ../hello-world/ \
2222
--buildpack ../hello-moon/

‎buildpacks/hello-world/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pack build sample-hello-world-app --builder cnbs/sample-builder:alpine --buildpa
1111
OR
1212

1313
```bash
14-
pack build sample-hello-world-app --builder cnbs/sample-builder:jammy --buildpack .
14+
pack build sample-hello-world-app --builder cnbs/sample-builder:noble --buildpack .
1515
```
1616

1717
THEN

‎buildpacks/java-maven/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ pack build sample-java-maven-app --builder cnbs/sample-builder:alpine --buildpac
1212
OR
1313

1414
```bash
15-
pack build sample-java-maven-app --builder cnbs/sample-builder:jammy --buildpack . --path ../../apps/java-maven
15+
pack build sample-java-maven-app --builder cnbs/sample-builder:noble --buildpack . --path ../../apps/java-maven
1616
```

‎buildpacks/kotlin-gradle/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ pack build sample-kotlin-gradle-app --builder cnbs/sample-builder:alpine --build
1212
OR
1313

1414
```bash
15-
pack build sample-kotlin-gradle-app --builder cnbs/sample-builder:jammy --buildpack . --path ../../apps/kotlin-gradle
15+
pack build sample-kotlin-gradle-app --builder cnbs/sample-builder:noble --buildpack . --path ../../apps/kotlin-gradle
1616
```

‎buildpacks/ruby-bundler/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ Compatible apps:
66
### Usage
77

88
```bash
9-
pack build sample-ruby-bundler-app --builder cnbs/sample-builder:jammy --buildpack . --path ../../apps/ruby-bundler
9+
pack build sample-ruby-bundler-app --builder cnbs/sample-builder:noble --buildpack . --path ../../apps/ruby-bundler
1010
```

0 commit comments

Comments
 (0)