diff --git a/tools/Dockerfiles/opensuse_latest b/tools/Dockerfiles/opensuse_latest index b5968602..33d97294 100644 --- a/tools/Dockerfiles/opensuse_latest +++ b/tools/Dockerfiles/opensuse_latest @@ -4,8 +4,8 @@ FROM opensuse:latest RUN true \ && zypper refresh \ && zypper update \ - && zypper install -y gcc make rpm-build \ - && zypper install -d jss \ + && zypper install -y gcc make rpm-build ws-jaxme yum \ + && zypper install -d mozilla-jss \ && mkdir -p /home/sandbox \ && yum clean -y all \ && rm -rf /usr/share/doc /usr/share/doc-base \ @@ -16,15 +16,14 @@ RUN true \ WORKDIR /home/sandbox COPY . /home/sandbox/jss -# Install dependencies from the spec file in case they've changed -# since the last release on this platform. +# Install build dependencies. RUN true \ - && zypper install -d -y /home/sandbox/jss/jss.spec \ + && zypper --non-interactive source-install mozilla-jss-debugsource \ && true -# Perform the actual RPM build +# Perform the build WORKDIR /home/sandbox/jss CMD true \ - && bash ./build.sh --with-timestamp --with-commit-id rpm \ - && yum install -y /root/build/jss/RPMS/*.rpm \ + && . tools/autoenv.sh \ + && make clean all check \ && true