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 julia #15889

Merged
merged 1 commit into from
Dec 12, 2023
Merged

Update julia #15889

merged 1 commit into from
Dec 12, 2023

Conversation

tianon
Copy link
Member

@tianon tianon commented Dec 11, 2023

Changes:

Changes:

- docker-library/julia@fca0328: Merge pull request docker-library/julia#87 from J0WI/alpine-3.19
- docker-library/julia@8c02ddd: Alpine 3.19
Copy link

Diff for e2820b4:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index f5608fd..9c80d85 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,14 +1,14 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
 GitRepo: https://github.com/docker-library/julia.git
 
-Tags: 1.6.7-alpine3.17, 1.6-alpine3.17
-GitCommit: ff6d8f64752b64aff292e12162340e3707487f17
-Directory: 1.6/alpine3.17
-
-Tags: 1.6.7-alpine3.18, 1.6-alpine3.18, 1.6.7-alpine, 1.6-alpine
+Tags: 1.6.7-alpine3.18, 1.6-alpine3.18
 GitCommit: ff6d8f64752b64aff292e12162340e3707487f17
 Directory: 1.6/alpine3.18
 
+Tags: 1.6.7-alpine3.19, 1.6-alpine3.19, 1.6.7-alpine, 1.6-alpine
+GitCommit: 8c02ddd7b55c85f022fcbc39f9791fbd95cdef2e
+Directory: 1.6/alpine3.19
+
 Tags: 1.6.7-bookworm, 1.6-bookworm
 SharedTags: 1.6.7, 1.6
 Architectures: amd64, arm32v7, arm64v8, i386
@@ -36,14 +36,14 @@ Directory: 1.6/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
 
-Tags: 1.9.4-alpine3.17, 1.9-alpine3.17, 1-alpine3.17, alpine3.17
-GitCommit: 154363df0b038fb8a5e74bb97bbed3fb8faea7ca
-Directory: 1.9/alpine3.17
-
-Tags: 1.9.4-alpine3.18, 1.9-alpine3.18, 1-alpine3.18, alpine3.18, 1.9.4-alpine, 1.9-alpine, 1-alpine, alpine
+Tags: 1.9.4-alpine3.18, 1.9-alpine3.18, 1-alpine3.18, alpine3.18
 GitCommit: 154363df0b038fb8a5e74bb97bbed3fb8faea7ca
 Directory: 1.9/alpine3.18
 
+Tags: 1.9.4-alpine3.19, 1.9-alpine3.19, 1-alpine3.19, alpine3.19, 1.9.4-alpine, 1.9-alpine, 1-alpine, alpine
+GitCommit: 8c02ddd7b55c85f022fcbc39f9791fbd95cdef2e
+Directory: 1.9/alpine3.19
+
 Tags: 1.9.4-bookworm, 1.9-bookworm, 1-bookworm, bookworm
 SharedTags: 1.9.4, 1.9, 1, latest
 Architectures: amd64, arm64v8, i386, ppc64le
@@ -71,14 +71,14 @@ Directory: 1.9/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
 
-Tags: 1.10.0-rc2-alpine3.17, 1.10-rc-alpine3.17, rc-alpine3.17
-GitCommit: 8852e4c19fd19cdfe676e956ce3a53ca04278d8c
-Directory: 1.10-rc/alpine3.17
-
-Tags: 1.10.0-rc2-alpine3.18, 1.10-rc-alpine3.18, rc-alpine3.18, 1.10.0-rc2-alpine, 1.10-rc-alpine, rc-alpine
+Tags: 1.10.0-rc2-alpine3.18, 1.10-rc-alpine3.18, rc-alpine3.18
 GitCommit: 8852e4c19fd19cdfe676e956ce3a53ca04278d8c
 Directory: 1.10-rc/alpine3.18
 
+Tags: 1.10.0-rc2-alpine3.19, 1.10-rc-alpine3.19, rc-alpine3.19, 1.10.0-rc2-alpine, 1.10-rc-alpine, rc-alpine
+GitCommit: 8c02ddd7b55c85f022fcbc39f9791fbd95cdef2e
+Directory: 1.10-rc/alpine3.19
+
 Tags: 1.10.0-rc2-bookworm, 1.10-rc-bookworm, rc-bookworm
 SharedTags: 1.10.0-rc2, 1.10-rc, rc
 Architectures: amd64, arm64v8, i386, ppc64le
diff --git a/_bashbrew-list b/_bashbrew-list
index 48886e0..91af980 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,7 @@
 julia:1
 julia:1-alpine
-julia:1-alpine3.17
 julia:1-alpine3.18
+julia:1-alpine3.19
 julia:1-bookworm
 julia:1-bullseye
 julia:1-windowsservercore
@@ -9,8 +9,8 @@ julia:1-windowsservercore-1809
 julia:1-windowsservercore-ltsc2022
 julia:1.6
 julia:1.6-alpine
-julia:1.6-alpine3.17
 julia:1.6-alpine3.18
+julia:1.6-alpine3.19
 julia:1.6-bookworm
 julia:1.6-bullseye
 julia:1.6-windowsservercore
@@ -18,8 +18,8 @@ julia:1.6-windowsservercore-1809
 julia:1.6-windowsservercore-ltsc2022
 julia:1.6.7
 julia:1.6.7-alpine
-julia:1.6.7-alpine3.17
 julia:1.6.7-alpine3.18
+julia:1.6.7-alpine3.19
 julia:1.6.7-bookworm
 julia:1.6.7-bullseye
 julia:1.6.7-windowsservercore
@@ -27,8 +27,8 @@ julia:1.6.7-windowsservercore-1809
 julia:1.6.7-windowsservercore-ltsc2022
 julia:1.9
 julia:1.9-alpine
-julia:1.9-alpine3.17
 julia:1.9-alpine3.18
+julia:1.9-alpine3.19
 julia:1.9-bookworm
 julia:1.9-bullseye
 julia:1.9-windowsservercore
@@ -36,8 +36,8 @@ julia:1.9-windowsservercore-1809
 julia:1.9-windowsservercore-ltsc2022
 julia:1.9.4
 julia:1.9.4-alpine
-julia:1.9.4-alpine3.17
 julia:1.9.4-alpine3.18
+julia:1.9.4-alpine3.19
 julia:1.9.4-bookworm
 julia:1.9.4-bullseye
 julia:1.9.4-windowsservercore
@@ -45,8 +45,8 @@ julia:1.9.4-windowsservercore-1809
 julia:1.9.4-windowsservercore-ltsc2022
 julia:1.10-rc
 julia:1.10-rc-alpine
-julia:1.10-rc-alpine3.17
 julia:1.10-rc-alpine3.18
+julia:1.10-rc-alpine3.19
 julia:1.10-rc-bookworm
 julia:1.10-rc-bullseye
 julia:1.10-rc-windowsservercore
@@ -54,23 +54,23 @@ julia:1.10-rc-windowsservercore-1809
 julia:1.10-rc-windowsservercore-ltsc2022
 julia:1.10.0-rc2
 julia:1.10.0-rc2-alpine
-julia:1.10.0-rc2-alpine3.17
 julia:1.10.0-rc2-alpine3.18
+julia:1.10.0-rc2-alpine3.19
 julia:1.10.0-rc2-bookworm
 julia:1.10.0-rc2-bullseye
 julia:1.10.0-rc2-windowsservercore
 julia:1.10.0-rc2-windowsservercore-1809
 julia:1.10.0-rc2-windowsservercore-ltsc2022
 julia:alpine
-julia:alpine3.17
 julia:alpine3.18
+julia:alpine3.19
 julia:bookworm
 julia:bullseye
 julia:latest
 julia:rc
 julia:rc-alpine
-julia:rc-alpine3.17
 julia:rc-alpine3.18
+julia:rc-alpine3.19
 julia:rc-bookworm
 julia:rc-bullseye
 julia:rc-windowsservercore
diff --git a/julia_1.6-alpine/Dockerfile b/julia_1.6-alpine/Dockerfile
index 05c297a..f60fdc2 100644
--- a/julia_1.6-alpine/Dockerfile
+++ b/julia_1.6-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.18
+FROM alpine:3.19
 
 ENV JULIA_PATH /usr/local/julia
 ENV PATH $JULIA_PATH/bin:$PATH
@@ -54,7 +54,7 @@ RUN set -eux; \
 # smoke test
 	julia --version; \
 	\
-	echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"julia-sbom","packages":[{"name":"julia","versionInfo":"1.6.7","SPDXID":"SPDXRef-Package--julia","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.18"}],"licenseDeclared":"MIT"}]}' > $JULIA_PATH/julia.spdx.json;
+	echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"julia-sbom","packages":[{"name":"julia","versionInfo":"1.6.7","SPDXID":"SPDXRef-Package--julia","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.19"}],"licenseDeclared":"MIT"}]}' > $JULIA_PATH/julia.spdx.json;
 
 COPY docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["docker-entrypoint.sh"]
diff --git a/julia_1.6-alpine3.17/Dockerfile b/julia_1.6-alpine3.17/Dockerfile
deleted file mode 100644
index bea20bc..0000000
diff --git a/julia_1.6-alpine/Dockerfile b/julia_1.6-alpine3.18/Dockerfile
similarity index 100%
copy from julia_1.6-alpine/Dockerfile
copy to julia_1.6-alpine3.18/Dockerfile
diff --git a/julia_1.6-alpine3.17/docker-entrypoint.sh b/julia_1.6-alpine3.18/docker-entrypoint.sh
similarity index 100%
rename from julia_1.6-alpine3.17/docker-entrypoint.sh
rename to julia_1.6-alpine3.18/docker-entrypoint.sh
diff --git a/julia_alpine/Dockerfile b/julia_alpine/Dockerfile
index 847e74e..1c31974 100644
--- a/julia_alpine/Dockerfile
+++ b/julia_alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.18
+FROM alpine:3.19
 
 ENV JULIA_PATH /usr/local/julia
 ENV PATH $JULIA_PATH/bin:$PATH
@@ -54,7 +54,7 @@ RUN set -eux; \
 # smoke test
 	julia --version; \
 	\
-	echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"julia-sbom","packages":[{"name":"julia","versionInfo":"1.9.4","SPDXID":"SPDXRef-Package--julia","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.18"}],"licenseDeclared":"MIT"}]}' > $JULIA_PATH/julia.spdx.json;
+	echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"julia-sbom","packages":[{"name":"julia","versionInfo":"1.9.4","SPDXID":"SPDXRef-Package--julia","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.19"}],"licenseDeclared":"MIT"}]}' > $JULIA_PATH/julia.spdx.json;
 
 COPY docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["docker-entrypoint.sh"]
diff --git a/julia_alpine3.17/Dockerfile b/julia_alpine3.17/Dockerfile
deleted file mode 100644
index fe3bfd6..0000000
diff --git a/julia_alpine/Dockerfile b/julia_alpine3.18/Dockerfile
similarity index 100%
copy from julia_alpine/Dockerfile
copy to julia_alpine3.18/Dockerfile
diff --git a/julia_alpine3.17/docker-entrypoint.sh b/julia_alpine3.18/docker-entrypoint.sh
similarity index 100%
rename from julia_alpine3.17/docker-entrypoint.sh
rename to julia_alpine3.18/docker-entrypoint.sh
diff --git a/julia_rc-alpine/Dockerfile b/julia_rc-alpine/Dockerfile
index 74fdf67..8b912b2 100644
--- a/julia_rc-alpine/Dockerfile
+++ b/julia_rc-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.18
+FROM alpine:3.19
 
 ENV JULIA_PATH /usr/local/julia
 ENV PATH $JULIA_PATH/bin:$PATH
@@ -54,7 +54,7 @@ RUN set -eux; \
 # smoke test
 	julia --version; \
 	\
-	echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"julia-sbom","packages":[{"name":"julia","versionInfo":"1.10.0-rc2","SPDXID":"SPDXRef-Package--julia","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.18"}],"licenseDeclared":"MIT"}]}' > $JULIA_PATH/julia.spdx.json;
+	echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"julia-sbom","packages":[{"name":"julia","versionInfo":"1.10.0-rc2","SPDXID":"SPDXRef-Package--julia","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.19"}],"licenseDeclared":"MIT"}]}' > $JULIA_PATH/julia.spdx.json;
 
 COPY docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["docker-entrypoint.sh"]
diff --git a/julia_rc-alpine3.17/Dockerfile b/julia_rc-alpine3.17/Dockerfile
deleted file mode 100644
index e622d44..0000000
diff --git a/julia_rc-alpine/Dockerfile b/julia_rc-alpine3.18/Dockerfile
similarity index 100%
copy from julia_rc-alpine/Dockerfile
copy to julia_rc-alpine3.18/Dockerfile
diff --git a/julia_rc-alpine3.17/docker-entrypoint.sh b/julia_rc-alpine3.18/docker-entrypoint.sh
similarity index 100%
rename from julia_rc-alpine3.17/docker-entrypoint.sh
rename to julia_rc-alpine3.18/docker-entrypoint.sh

Relevant Maintainers:

@yosifkit yosifkit merged commit 8f16e11 into docker-library:master Dec 12, 2023
20 of 23 checks passed
@yosifkit yosifkit deleted the julia branch December 12, 2023 19:06
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.

3 participants