Do not crash if repo has already been added

Signed-off-by: Mauro Morales <[email protected]>
kairos-io · Dec 19, 2023 · 17c394a · 17c394a
1 parent 5e19ab7
commit 17c394a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/images/Dockerfile.kairos-opensuse b/images/Dockerfile.kairos-opensuse
@@ -15,19 +15,19 @@ ARG FRAMEWORK_VERSION=main
 FROM $BASE_IMAGE AS base
 
 FROM base AS leap-15.5-repo
-RUN zypper ar -G https://download.opensuse.org/repositories/utilities/15.5/utilities.repo && \
+RUN zypper ar -G https://download.opensuse.org/repositories/utilities/15.5/utilities.repo || true && \
     zypper ref
 
 FROM base AS tumbleweed-repo-amd64
 RUN zypper removerepo repo-openh264 && \
     zypper ref
 
 FROM base AS tumbleweed-repo-arm64
-RUN zypper ar https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/ aarch64 && \
+RUN zypper ar https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/ aarch64 || true && \
     zypper ref
 
 FROM tumbleweed-repo-${TARGETARCH} AS tumbleweed-repo
-RUN zypper ar -G https://download.opensuse.org/repositories/utilities/openSUSE_Factory/utilities.repo && \
+RUN zypper ar -G https://download.opensuse.org/repositories/utilities/openSUSE_Factory/utilities.repo || true && \
     zypper ref
 
 FROM ${FLAVOR_RELEASE}-repo AS common

diff --git a/images/Dockerfile.opensuse b/images/Dockerfile.opensuse
@@ -16,19 +16,19 @@ ARG FRAMEWORK_VERSION=main
 FROM $BASE_IMAGE AS base
 
 FROM base AS leap-15.5-repo
-RUN zypper ar -G https://download.opensuse.org/repositories/utilities/15.5/utilities.repo && \
+RUN zypper ar -G https://download.opensuse.org/repositories/utilities/15.5/utilities.repo || true && \
     zypper ref
 
 FROM base AS tumbleweed-repo-amd64
 RUN zypper removerepo repo-openh264 && \
     zypper ref
 
 FROM base AS tumbleweed-repo-arm64
-RUN zypper ar https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/ aarch64 && \
+RUN zypper ar https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/ aarch64 || true && \
     zypper ref
 
 FROM tumbleweed-repo-${TARGETARCH} AS tumbleweed-repo
-RUN zypper ar -G https://download.opensuse.org/repositories/utilities/openSUSE_Factory/utilities.repo && \
+RUN zypper ar -G https://download.opensuse.org/repositories/utilities/openSUSE_Factory/utilities.repo || true && \
     zypper ref
 
 FROM ${FLAVOR_RELEASE}-repo AS common