From 818d7e62b3836958759c2de460336a5366826c5e Mon Sep 17 00:00:00 2001 From: George Adams Date: Tue, 31 Oct 2023 16:38:39 +0000 Subject: [PATCH] fixup --- 8/jdk/ubuntu/focal/Dockerfile | 6 +++--- 8/jdk/ubuntu/jammy/Dockerfile | 6 +++--- 8/jre/ubuntu/focal/Dockerfile | 6 +++--- 8/jre/ubuntu/jammy/Dockerfile | 6 +++--- docker_templates/partials/multi-arch-install.j2 | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/8/jdk/ubuntu/focal/Dockerfile b/8/jdk/ubuntu/focal/Dockerfile index 1a54b3009..84b543f66 100644 --- a/8/jdk/ubuntu/focal/Dockerfile +++ b/8/jdk/ubuntu/focal/Dockerfile @@ -60,9 +60,9 @@ RUN set -eux; \ ESUM='9e574cff0b8dba29930e38eeec4cb4350a77a56a27d03fa316fa6b2383eeef9d'; \ BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jdk_arm_linux_hotspot_8u392b08.tar.gz'; \ # Fixes libatomic.so.1: cannot open shared object file - apt-get update \\ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libatomic1 \\ - && rm -rf /var/lib/apt/lists/* \\ + apt-get update; \\ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libatomic1; \\ + rm -rf /var/lib/apt/lists/*; \\ ;; \ ppc64el|powerpc:common64) \ ESUM='9d9813d2840360ffdbc449c45e71124e8170c31a3b6cce9151fbb31352064406'; \ diff --git a/8/jdk/ubuntu/jammy/Dockerfile b/8/jdk/ubuntu/jammy/Dockerfile index 95b8f9c05..aa38b56f7 100644 --- a/8/jdk/ubuntu/jammy/Dockerfile +++ b/8/jdk/ubuntu/jammy/Dockerfile @@ -60,9 +60,9 @@ RUN set -eux; \ ESUM='9e574cff0b8dba29930e38eeec4cb4350a77a56a27d03fa316fa6b2383eeef9d'; \ BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jdk_arm_linux_hotspot_8u392b08.tar.gz'; \ # Fixes libatomic.so.1: cannot open shared object file - apt-get update \\ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libatomic1 \\ - && rm -rf /var/lib/apt/lists/* \\ + apt-get update; \\ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libatomic1; \\ + rm -rf /var/lib/apt/lists/*; \\ ;; \ ppc64el|powerpc:common64) \ ESUM='9d9813d2840360ffdbc449c45e71124e8170c31a3b6cce9151fbb31352064406'; \ diff --git a/8/jre/ubuntu/focal/Dockerfile b/8/jre/ubuntu/focal/Dockerfile index fefc7b250..6021e72cb 100644 --- a/8/jre/ubuntu/focal/Dockerfile +++ b/8/jre/ubuntu/focal/Dockerfile @@ -60,9 +60,9 @@ RUN set -eux; \ ESUM='877953bfabcdbcd000c11364d806456ca579a921085de2ca942280ebe168cac2'; \ BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jre_arm_linux_hotspot_8u392b08.tar.gz'; \ # Fixes libatomic.so.1: cannot open shared object file - apt-get update \\ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libatomic1 \\ - && rm -rf /var/lib/apt/lists/* \\ + apt-get update; \\ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libatomic1; \\ + rm -rf /var/lib/apt/lists/*; \\ ;; \ ppc64el|powerpc:common64) \ ESUM='0ecb0aeb54fb9d3c9e1a7ea411490127e8e298d93219fafc4dd6051a5b74671f'; \ diff --git a/8/jre/ubuntu/jammy/Dockerfile b/8/jre/ubuntu/jammy/Dockerfile index 57a10fe56..0bab81ff9 100644 --- a/8/jre/ubuntu/jammy/Dockerfile +++ b/8/jre/ubuntu/jammy/Dockerfile @@ -60,9 +60,9 @@ RUN set -eux; \ ESUM='877953bfabcdbcd000c11364d806456ca579a921085de2ca942280ebe168cac2'; \ BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jre_arm_linux_hotspot_8u392b08.tar.gz'; \ # Fixes libatomic.so.1: cannot open shared object file - apt-get update \\ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libatomic1 \\ - && rm -rf /var/lib/apt/lists/* \\ + apt-get update; \\ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libatomic1; \\ + rm -rf /var/lib/apt/lists/*; \\ ;; \ ppc64el|powerpc:common64) \ ESUM='0ecb0aeb54fb9d3c9e1a7ea411490127e8e298d93219fafc4dd6051a5b74671f'; \ diff --git a/docker_templates/partials/multi-arch-install.j2 b/docker_templates/partials/multi-arch-install.j2 index 1b32f8a77..f29762630 100644 --- a/docker_templates/partials/multi-arch-install.j2 +++ b/docker_templates/partials/multi-arch-install.j2 @@ -7,9 +7,9 @@ RUN set -eux; \ BINARY_URL='{{ details.download_url }}'; \ {% if architecture == "armhf|arm" and os == "ubuntu" and version|int == 8 -%} # Fixes libatomic.so.1: cannot open shared object file - apt-get update \\ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libatomic1 \\ - && rm -rf /var/lib/apt/lists/* \\ + apt-get update; \\ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libatomic1; \\ + rm -rf /var/lib/apt/lists/*; \\ {% endif -%} ;; \ {% endfor -%}