From 488b727aa77530df3a9f766425694343e3861bbb Mon Sep 17 00:00:00 2001 From: Paolo Asperti Date: Thu, 25 Apr 2019 20:16:39 +0200 Subject: [PATCH] no need to set working dir --- Dockerfile | 13 ++++--------- README.md | 3 +-- run.sh | 12 ++++++++++++ 3 files changed, 17 insertions(+), 11 deletions(-) create mode 100755 run.sh diff --git a/Dockerfile b/Dockerfile index 4c2a0c5..6d9f317 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,14 +9,9 @@ RUN \ # other packages often needed RUN yum install -y nethserver-devtools hunspell-en -RUN \ - echo "# macros" > /root/.rpmmacros && \ - echo "%_topdir /build" >> /root/.rpmmacros && \ - echo "%_sourcedir %{_topdir}" >> /root/.rpmmacros && \ - echo "%_builddir %{_topdir}" >> /root/.rpmmacros && \ - echo "%_specdir %{_topdir}" >> /root/.rpmmacros && \ - echo "%_rpmdir %{_topdir}" >> /root/.rpmmacros && \ - echo "%_srcrpmdir %{_topdir}" >> /root/.rpmmacros && \ - rpmdev-setuptree +ADD run.sh /usr/local/bin +RUN chmod 755 /usr/local/bin/run.sh ENV PATH=/usr/bin:/sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin + +ENTRYPOINT ["/usr/local/bin/run.sh"] diff --git a/README.md b/README.md index 7786e60..56b69a4 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,8 @@ name: default steps: - name: build - image: registry.libreschool.org/libreschool-automation/rpm-build:latest + image: registry.libreschool.org/libreschool-automation/rpm-build:7 pull: always - working_dir: /build commands: - yum-builddep -y mypackage.spec - rpmbuild -ba mypackage.spec diff --git a/run.sh b/run.sh new file mode 100755 index 0000000..108b7f7 --- /dev/null +++ b/run.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +set -e + +echo "# macros" > /root/.rpmmacros && \ +echo "%_topdir /$PWD" >> /root/.rpmmacros && \ +echo "%_sourcedir %{_topdir}" >> /root/.rpmmacros && \ +echo "%_builddir %{_topdir}" >> /root/.rpmmacros && \ +echo "%_specdir %{_topdir}" >> /root/.rpmmacros && \ +echo "%_rpmdir %{_topdir}" >> /root/.rpmmacros && \ +echo "%_srcrpmdir %{_topdir}" >> /root/.rpmmacros && \ +rpmdev-setuptree