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 bash #18314

Merged
merged 1 commit into from
Jan 28, 2025
Merged

Update bash #18314

merged 1 commit into from
Jan 28, 2025

Conversation

tianon
Copy link
Member

@tianon tianon commented Jan 25, 2025

Changes:

@tianon tianon requested review from LaurentGoderre and a team as code owners January 25, 2025 00:41

This comment has been minimized.

Changes:

- tianon/docker-bash@9d45ba2: Also apply job control fix to 4.4
- tianon/docker-bash@fc161dc: Merge pull request tianon/docker-bash#45 from chaifeng/fix-job-control
- tianon/docker-bash@ddea3cd: Fix missing Job Control builtins in Bash 3.0-4.3 and stabilize Bash 3.x builds
Copy link

Diff for d09bcae:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 1c34329..bffcefb 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,42 +3,42 @@ GitRepo: https://github.com/tianon/docker-bash.git
 
 Tags: 3.0.22, 3.0, 3.0.22-alpine3.21, 3.0-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 4811b83a9b81e2af6587fbe01c7932a078cb1acc
+GitCommit: ddea3cd1ca0fc97dc8ba41ddac489eec71ee8081
 Directory: 3.0
 
 Tags: 3.1.23, 3.1, 3.1.23-alpine3.21, 3.1-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 4811b83a9b81e2af6587fbe01c7932a078cb1acc
+GitCommit: ddea3cd1ca0fc97dc8ba41ddac489eec71ee8081
 Directory: 3.1
 
 Tags: 3.2.57, 3.2, 3, 3.2.57-alpine3.21, 3.2-alpine3.21, 3-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 4811b83a9b81e2af6587fbe01c7932a078cb1acc
+GitCommit: ddea3cd1ca0fc97dc8ba41ddac489eec71ee8081
 Directory: 3.2
 
 Tags: 4.0.44, 4.0, 4.0.44-alpine3.21, 4.0-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 4811b83a9b81e2af6587fbe01c7932a078cb1acc
+GitCommit: ddea3cd1ca0fc97dc8ba41ddac489eec71ee8081
 Directory: 4.0
 
 Tags: 4.1.17, 4.1, 4.1.17-alpine3.21, 4.1-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 4811b83a9b81e2af6587fbe01c7932a078cb1acc
+GitCommit: ddea3cd1ca0fc97dc8ba41ddac489eec71ee8081
 Directory: 4.1
 
 Tags: 4.2.53, 4.2, 4.2.53-alpine3.21, 4.2-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 4811b83a9b81e2af6587fbe01c7932a078cb1acc
+GitCommit: ddea3cd1ca0fc97dc8ba41ddac489eec71ee8081
 Directory: 4.2
 
 Tags: 4.3.48, 4.3, 4.3.48-alpine3.21, 4.3-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 4811b83a9b81e2af6587fbe01c7932a078cb1acc
+GitCommit: ddea3cd1ca0fc97dc8ba41ddac489eec71ee8081
 Directory: 4.3
 
 Tags: 4.4.23, 4.4, 4, 4.4.23-alpine3.21, 4.4-alpine3.21, 4-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 4811b83a9b81e2af6587fbe01c7932a078cb1acc
+GitCommit: 9d45ba25a4e765a55bac62098e4f0360dc3c79b3
 Directory: 4.4
 
 Tags: 5.0.18, 5.0, 5.0.18-alpine3.21, 5.0-alpine3.21
diff --git a/bash_3-alpine3.21/Dockerfile b/bash_3-alpine3.21/Dockerfile
index 9bf2050..fc8426f 100644
--- a/bash_3-alpine3.21/Dockerfile
+++ b/bash_3-alpine3.21/Dockerfile
@@ -100,6 +100,8 @@ RUN set -eux; \
 	for f in config.guess config.sub; do \
 		wget -O "support/$f" "https://git.savannah.gnu.org/cgit/config.git/plain/$f?id=7d3d27baf8107b630586c962c057e22149653deb"; \
 	done; \
+# https://github.com/tianon/docker-bash/pull/45
+	export CFLAGS='-Wno-error=implicit-int -Wno-error=implicit-function-declaration'; \
 	./configure \
 		--build="$gnuArch" \
 		--enable-readline \
@@ -113,7 +115,7 @@ RUN set -eux; \
 	}; \
 # parallel jobs workaround borrowed from Alpine :)
 	make y.tab.c; make builtins/libbuiltins.a; \
-	make -j "$(nproc)"; \
+	make -j 1; \
 	make install; \
 	cd /; \
 	rm -r /usr/local/src/bash; \
diff --git a/bash_3.0-alpine3.21/Dockerfile b/bash_3.0-alpine3.21/Dockerfile
index 55a3ceb..9f24b78 100644
--- a/bash_3.0-alpine3.21/Dockerfile
+++ b/bash_3.0-alpine3.21/Dockerfile
@@ -100,6 +100,8 @@ RUN set -eux; \
 	for f in config.guess config.sub; do \
 		wget -O "support/$f" "https://git.savannah.gnu.org/cgit/config.git/plain/$f?id=7d3d27baf8107b630586c962c057e22149653deb"; \
 	done; \
+# https://github.com/tianon/docker-bash/pull/45
+	export CFLAGS='-Wno-error=implicit-int -Wno-error=implicit-function-declaration'; \
 	./configure \
 		--build="$gnuArch" \
 		--enable-readline \
@@ -113,7 +115,7 @@ RUN set -eux; \
 	}; \
 # parallel jobs workaround borrowed from Alpine :)
 	make y.tab.c; make builtins/libbuiltins.a; \
-	make -j "$(nproc)"; \
+	make -j 1; \
 	make install; \
 	cd /; \
 	rm -r /usr/local/src/bash; \
diff --git a/bash_3.1-alpine3.21/Dockerfile b/bash_3.1-alpine3.21/Dockerfile
index 60b2daa..f6e7914 100644
--- a/bash_3.1-alpine3.21/Dockerfile
+++ b/bash_3.1-alpine3.21/Dockerfile
@@ -99,6 +99,8 @@ RUN set -eux; \
 	for f in config.guess config.sub; do \
 		wget -O "support/$f" "https://git.savannah.gnu.org/cgit/config.git/plain/$f?id=7d3d27baf8107b630586c962c057e22149653deb"; \
 	done; \
+# https://github.com/tianon/docker-bash/pull/45
+	export CFLAGS='-Wno-error=implicit-int -Wno-error=implicit-function-declaration'; \
 	./configure \
 		--build="$gnuArch" \
 		--enable-readline \
@@ -112,7 +114,7 @@ RUN set -eux; \
 	}; \
 # parallel jobs workaround borrowed from Alpine :)
 	make y.tab.c; make builtins/libbuiltins.a; \
-	make -j "$(nproc)"; \
+	make -j 1; \
 	make install; \
 	cd /; \
 	rm -r /usr/local/src/bash; \
diff --git a/bash_4-alpine3.21/Dockerfile b/bash_4-alpine3.21/Dockerfile
index 689d2a4..36f1873 100644
--- a/bash_4-alpine3.21/Dockerfile
+++ b/bash_4-alpine3.21/Dockerfile
@@ -100,6 +100,8 @@ RUN set -eux; \
 	for f in config.guess config.sub; do \
 		wget -O "support/$f" "https://git.savannah.gnu.org/cgit/config.git/plain/$f?id=7d3d27baf8107b630586c962c057e22149653deb"; \
 	done; \
+# https://github.com/tianon/docker-bash/pull/45
+	export CFLAGS='-Wno-error=implicit-int -Wno-error=implicit-function-declaration'; \
 	./configure \
 		--build="$gnuArch" \
 		--enable-readline \
diff --git a/bash_4.0-alpine3.21/Dockerfile b/bash_4.0-alpine3.21/Dockerfile
index ba5f1f6..9e7e3ea 100644
--- a/bash_4.0-alpine3.21/Dockerfile
+++ b/bash_4.0-alpine3.21/Dockerfile
@@ -99,6 +99,8 @@ RUN set -eux; \
 	for f in config.guess config.sub; do \
 		wget -O "support/$f" "https://git.savannah.gnu.org/cgit/config.git/plain/$f?id=7d3d27baf8107b630586c962c057e22149653deb"; \
 	done; \
+# https://github.com/tianon/docker-bash/pull/45
+	export CFLAGS='-Wno-error=implicit-int -Wno-error=implicit-function-declaration'; \
 	./configure \
 		--build="$gnuArch" \
 		--enable-readline \
diff --git a/bash_4.1-alpine3.21/Dockerfile b/bash_4.1-alpine3.21/Dockerfile
index 071b2c1..69cfcdb 100644
--- a/bash_4.1-alpine3.21/Dockerfile
+++ b/bash_4.1-alpine3.21/Dockerfile
@@ -99,6 +99,8 @@ RUN set -eux; \
 	for f in config.guess config.sub; do \
 		wget -O "support/$f" "https://git.savannah.gnu.org/cgit/config.git/plain/$f?id=7d3d27baf8107b630586c962c057e22149653deb"; \
 	done; \
+# https://github.com/tianon/docker-bash/pull/45
+	export CFLAGS='-Wno-error=implicit-int -Wno-error=implicit-function-declaration'; \
 	./configure \
 		--build="$gnuArch" \
 		--enable-readline \
diff --git a/bash_4.2-alpine3.21/Dockerfile b/bash_4.2-alpine3.21/Dockerfile
index b4ce0d6..fda1b21 100644
--- a/bash_4.2-alpine3.21/Dockerfile
+++ b/bash_4.2-alpine3.21/Dockerfile
@@ -100,6 +100,8 @@ RUN set -eux; \
 	for f in config.guess config.sub; do \
 		wget -O "support/$f" "https://git.savannah.gnu.org/cgit/config.git/plain/$f?id=7d3d27baf8107b630586c962c057e22149653deb"; \
 	done; \
+# https://github.com/tianon/docker-bash/pull/45
+	export CFLAGS='-Wno-error=implicit-int -Wno-error=implicit-function-declaration'; \
 	./configure \
 		--build="$gnuArch" \
 		--enable-readline \
diff --git a/bash_4.3-alpine3.21/Dockerfile b/bash_4.3-alpine3.21/Dockerfile
index aa1bcda..f15999e 100644
--- a/bash_4.3-alpine3.21/Dockerfile
+++ b/bash_4.3-alpine3.21/Dockerfile
@@ -100,6 +100,8 @@ RUN set -eux; \
 	for f in config.guess config.sub; do \
 		wget -O "support/$f" "https://git.savannah.gnu.org/cgit/config.git/plain/$f?id=7d3d27baf8107b630586c962c057e22149653deb"; \
 	done; \
+# https://github.com/tianon/docker-bash/pull/45
+	export CFLAGS='-Wno-error=implicit-int -Wno-error=implicit-function-declaration'; \
 	./configure \
 		--build="$gnuArch" \
 		--enable-readline \

Relevant Maintainers:

@yosifkit yosifkit merged commit f684376 into docker-library:master Jan 28, 2025
18 checks passed
@yosifkit yosifkit deleted the bash branch January 28, 2025 00:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants