Compare commits
No commits in common. "master" and "7.6-v1" have entirely different histories.
12
.drone.yml
12
.drone.yml
@ -1,5 +1,4 @@
|
|||||||
kind: pipeline
|
kind: pipeline
|
||||||
type: docker
|
|
||||||
name: default
|
name: default
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
@ -9,7 +8,7 @@ steps:
|
|||||||
settings:
|
settings:
|
||||||
daemon_off: false
|
daemon_off: false
|
||||||
dry_run: true
|
dry_run: true
|
||||||
repo: git.libreschool.org/libreschool-automation/rpm-build
|
repo: registry.libreschool.org/libreschool-automation/rpm-build
|
||||||
tags:
|
tags:
|
||||||
- latest
|
- latest
|
||||||
- 7
|
- 7
|
||||||
@ -23,16 +22,15 @@ steps:
|
|||||||
pull: always
|
pull: always
|
||||||
settings:
|
settings:
|
||||||
daemon_off: false
|
daemon_off: false
|
||||||
force_tag: true
|
|
||||||
registry: git.libreschool.org
|
|
||||||
username:
|
|
||||||
from_secret: docker_username
|
|
||||||
password:
|
password:
|
||||||
from_secret: docker_password
|
from_secret: docker_password
|
||||||
repo: git.libreschool.org/libreschool-automation/rpm-build
|
registry: registry.libreschool.org
|
||||||
|
repo: registry.libreschool.org/libreschool-automation/rpm-build
|
||||||
tags:
|
tags:
|
||||||
- latest
|
- latest
|
||||||
- 7
|
- 7
|
||||||
|
username:
|
||||||
|
from_secret: docker_username
|
||||||
when:
|
when:
|
||||||
event:
|
event:
|
||||||
- tag
|
- tag
|
||||||
|
23
Dockerfile
23
Dockerfile
@ -1,21 +1,22 @@
|
|||||||
FROM centos:7.7.1908
|
FROM centos:7
|
||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
sed -i 's/^keepcache.*/keepcache=1/' /etc/yum.conf && \
|
sed -i 's/^keepcache.*/keepcache=1/' /etc/yum.conf && \
|
||||||
yum upgrade -y && \
|
yum upgrade -y && \
|
||||||
yum localinstall -y http://mirror.nethserver.org/nethserver/7/base/x86_64/Packages/nethserver-release-7-19.ns7.noarch.rpm && \
|
yum localinstall -y http://mirror.nethserver.org/nethserver/7/base/x86_64/Packages/nethserver-release-7-11.ns7.noarch.rpm && \
|
||||||
yum install -y sudo cmake automake autoconf libtool gcc gcc-c++ epel-release && \
|
yum install -y sudo cmake automake autoconf libtool gcc gcc-c++ nethserver-mock
|
||||||
yum install -y nethserver-mock
|
|
||||||
|
|
||||||
# other packages often needed
|
# other packages often needed
|
||||||
RUN yum install -y nethserver-devtools hunspell-en
|
RUN yum install -y nethserver-devtools hunspell-en
|
||||||
|
|
||||||
ADD run.sh /usr/local/bin
|
RUN \
|
||||||
RUN chmod 755 /usr/local/bin/run.sh && \
|
echo "# macros" > /root/.rpmmacros && \
|
||||||
mkdir -p /drone/src && \
|
echo "%_topdir /build" >> /root/.rpmmacros && \
|
||||||
cd /drone/src && \
|
echo "%_sourcedir %{_topdir}" >> /root/.rpmmacros && \
|
||||||
/usr/local/bin/run.sh
|
echo "%_builddir %{_topdir}" >> /root/.rpmmacros && \
|
||||||
|
echo "%_specdir %{_topdir}" >> /root/.rpmmacros && \
|
||||||
|
echo "%_rpmdir %{_topdir}" >> /root/.rpmmacros && \
|
||||||
|
echo "%_srcrpmdir %{_topdir}" >> /root/.rpmmacros && \
|
||||||
|
rpmdev-setuptree
|
||||||
|
|
||||||
ENV PATH=/usr/bin:/sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin
|
ENV PATH=/usr/bin:/sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/local/bin/run.sh"]
|
|
||||||
|
@ -19,8 +19,9 @@ name: default
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: build
|
- name: build
|
||||||
image: git.libreschool.org/libreschool-automation/rpm-build:7
|
image: registry.libreschool.org/libreschool-automation/rpm-build:latest
|
||||||
pull: always
|
pull: always
|
||||||
|
working_dir: /build
|
||||||
commands:
|
commands:
|
||||||
- yum-builddep -y mypackage.spec
|
- yum-builddep -y mypackage.spec
|
||||||
- rpmbuild -ba mypackage.spec
|
- rpmbuild -ba mypackage.spec
|
||||||
|
12
run.sh
12
run.sh
@ -1,12 +0,0 @@
|
|||||||
#!/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
|
|
Loading…
x
Reference in New Issue
Block a user