From 75552708eefee7847e1a6d2846aab3c875a7ae0d Mon Sep 17 00:00:00 2001 From: Barb Cutler Date: Mon, 16 Jun 2025 22:01:50 -0400 Subject: [PATCH 1/5] bump to force rebuild --- dockerfiles/clang/14/Dockerfile | 2 ++ dockerfiles/gcc/11/Dockerfile | 2 ++ dockerfiles/python/3.10/Dockerfile | 2 ++ 3 files changed, 6 insertions(+) diff --git a/dockerfiles/clang/14/Dockerfile b/dockerfiles/clang/14/Dockerfile index 6bff491..032fb02 100644 --- a/dockerfiles/clang/14/Dockerfile +++ b/dockerfiles/clang/14/Dockerfile @@ -12,3 +12,5 @@ RUN rm -rf /var/lib/apt/lists/* # symlinks RUN ln -s /usr/bin/clang++-14 /usr/bin/clang++ RUN ln -s /usr/bin/clang-14 /usr/bin/clang + +# force-rebuild \ No newline at end of file diff --git a/dockerfiles/gcc/11/Dockerfile b/dockerfiles/gcc/11/Dockerfile index a3ac5f7..5d80970 100644 --- a/dockerfiles/gcc/11/Dockerfile +++ b/dockerfiles/gcc/11/Dockerfile @@ -15,3 +15,5 @@ RUN if test -e /usr/bin/x86_64-linux-gnu-g++-11; then ln -s /usr/bin/x86_64-linu # symlinks - ARM RUN if test -e /usr/bin/aarch64-linux-gnu-gcc-11; then ln -s /usr/bin/aarch64-linux-gnu-gcc-11 /usr/bin/gcc; fi RUN if test -e /usr/bin/aarch64-linux-gnu-g++-11; then ln -s /usr/bin/aarch64-linux-gnu-g++-11 /usr/bin/g++; fi + +# force-rebuild \ No newline at end of file diff --git a/dockerfiles/python/3.10/Dockerfile b/dockerfiles/python/3.10/Dockerfile index 208ae43..3c850ed 100644 --- a/dockerfiles/python/3.10/Dockerfile +++ b/dockerfiles/python/3.10/Dockerfile @@ -11,3 +11,5 @@ RUN rm -rf /var/lib/apt/lists/* # symlinks RUN ln -s /usr/bin/python3.10 /usr/bin/python3 + +# force-rebuild \ No newline at end of file From 5597c24df7ae64994d5e53e2a35012aed2f1f4a6 Mon Sep 17 00:00:00 2001 From: Barb Cutler Date: Mon, 23 Jun 2025 22:48:42 -0400 Subject: [PATCH 2/5] update libreoffice --- dockerfiles/libreoffice-writer/24/Dockerfile | 8 ++++++++ .../libreoffice-writer/libreoffice-writer/Dockerfile | 4 ---- dockerfiles/libreoffice-writer/metadata.json | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 dockerfiles/libreoffice-writer/24/Dockerfile delete mode 100644 dockerfiles/libreoffice-writer/libreoffice-writer/Dockerfile diff --git a/dockerfiles/libreoffice-writer/24/Dockerfile b/dockerfiles/libreoffice-writer/24/Dockerfile new file mode 100644 index 0000000..2e9c6a5 --- /dev/null +++ b/dockerfiles/libreoffice-writer/24/Dockerfile @@ -0,0 +1,8 @@ +FROM ubuntu:24.04 + +RUN apt-get update +RUN apt-get update --fix-missing +RUN apt-get install -y libreoffice-writer-nogui + +# cleanup +RUN rm -rf /var/lib/apt/lists/* \ No newline at end of file diff --git a/dockerfiles/libreoffice-writer/libreoffice-writer/Dockerfile b/dockerfiles/libreoffice-writer/libreoffice-writer/Dockerfile deleted file mode 100644 index e06210d..0000000 --- a/dockerfiles/libreoffice-writer/libreoffice-writer/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM ubuntu:22.04 - -RUN apt-get update -RUN apt-get install libreoffice-writer-nogui -y diff --git a/dockerfiles/libreoffice-writer/metadata.json b/dockerfiles/libreoffice-writer/metadata.json index 40ee5c3..dddf6a7 100644 --- a/dockerfiles/libreoffice-writer/metadata.json +++ b/dockerfiles/libreoffice-writer/metadata.json @@ -1,4 +1,4 @@ { "pushLatest": true, - "latestTag": "libreoffice-writer" + "latestTag": "24" } From 0c31c06a14f5480a61af36c877f320d653ca7ba2 Mon Sep 17 00:00:00 2001 From: Barb Cutler Date: Mon, 23 Jun 2025 23:12:28 -0400 Subject: [PATCH 3/5] edit --- dockerfiles/python/3.10/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/dockerfiles/python/3.10/Dockerfile b/dockerfiles/python/3.10/Dockerfile index 3c850ed..208ae43 100644 --- a/dockerfiles/python/3.10/Dockerfile +++ b/dockerfiles/python/3.10/Dockerfile @@ -11,5 +11,3 @@ RUN rm -rf /var/lib/apt/lists/* # symlinks RUN ln -s /usr/bin/python3.10 /usr/bin/python3 - -# force-rebuild \ No newline at end of file From 7de86b6fbf78c9347b4a5dfffc7647cd86d93a37 Mon Sep 17 00:00:00 2001 From: Barb Cutler Date: Mon, 23 Jun 2025 23:13:11 -0400 Subject: [PATCH 4/5] edit --- dockerfiles/gcc/11/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/dockerfiles/gcc/11/Dockerfile b/dockerfiles/gcc/11/Dockerfile index 5d80970..a3ac5f7 100644 --- a/dockerfiles/gcc/11/Dockerfile +++ b/dockerfiles/gcc/11/Dockerfile @@ -15,5 +15,3 @@ RUN if test -e /usr/bin/x86_64-linux-gnu-g++-11; then ln -s /usr/bin/x86_64-linu # symlinks - ARM RUN if test -e /usr/bin/aarch64-linux-gnu-gcc-11; then ln -s /usr/bin/aarch64-linux-gnu-gcc-11 /usr/bin/gcc; fi RUN if test -e /usr/bin/aarch64-linux-gnu-g++-11; then ln -s /usr/bin/aarch64-linux-gnu-g++-11 /usr/bin/g++; fi - -# force-rebuild \ No newline at end of file From 92e395238e0c5b0ad082d33322e09a6eb376bcd1 Mon Sep 17 00:00:00 2001 From: Barb Cutler Date: Mon, 23 Jun 2025 23:14:00 -0400 Subject: [PATCH 5/5] edit --- dockerfiles/clang/14/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/dockerfiles/clang/14/Dockerfile b/dockerfiles/clang/14/Dockerfile index 032fb02..6bff491 100644 --- a/dockerfiles/clang/14/Dockerfile +++ b/dockerfiles/clang/14/Dockerfile @@ -12,5 +12,3 @@ RUN rm -rf /var/lib/apt/lists/* # symlinks RUN ln -s /usr/bin/clang++-14 /usr/bin/clang++ RUN ln -s /usr/bin/clang-14 /usr/bin/clang - -# force-rebuild \ No newline at end of file