Skip to content

Commit

Permalink
add rpm lets connect
Browse files Browse the repository at this point in the history
  • Loading branch information
gijzelaerr committed Aug 10, 2018
1 parent fe84232 commit 5f582b0
Show file tree
Hide file tree
Showing 22 changed files with 114 additions and 22 deletions.
37 changes: 20 additions & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,32 @@
language: python
matrix:
include:
- env: DIST=centos_7_py2
- env: DIST=centos_7_rpm
- env: DIST=debian_jessie_py2
- env: DIST=debian_jessie_py3
- env: DIST=fedora_27_py2
- env: DIST=fedora_27_py3
- env: DIST=fedora_28_py2
- env: DIST=fedora_28_py3
- env: DIST=fedora_27_rpm
- env: DIST=fedora_28_rpm
- env: DIST=ubuntu_xenial_py2
- env: DIST=ubuntu_bionic_py2
- env: DIST=ubuntu_bionic_py3
- env: DIST=ubuntu_bionic_py3_pep8
- env: DIST=ubuntu_bionic_py3_mypy
- env: DIST=ubuntu_bionic_doc
- env: DIST=eduvpn_centos_7_py2
- env: DIST=eduvpn_centos_7_rpm
- env: DIST=eduvpn_debian_jessie_py2
- env: DIST=eduvpn_debian_jessie_py3
- env: DIST=eduvpn_fedora_27_py2
- env: DIST=eduvpn_fedora_27_py3
- env: DIST=eduvpn_fedora_28_py2
- env: DIST=eduvpn_fedora_28_py3
- env: DIST=eduvpn_fedora_27_rpm
- env: DIST=eduvpn_fedora_28_rpm
- env: DIST=eduvpn_ubuntu_xenial_py2
- env: DIST=eduvpn_ubuntu_bionic_py2
- env: DIST=eduvpn_ubuntu_bionic_py3
- env: DIST=eduvpn_ubuntu_bionic_py3_pep8
- env: DIST=eduvpn_ubuntu_bionic_py3_mypy
- env: DIST=eduvpn_ubuntu_bionic_doc
- env: DIST=lets_connect_centos_7_rpm
- env: DIST=lets_connect_fedora_27_rpm
- env: DIST=lets_connect_fedora_28_rpm
sudo: required
services:
- docker
before_install:
- true
install:
- docker build . -t ${DIST} -f docker/Dockerfile.${DIST}
- docker build . -t ${DIST} -f docker/${DIST}
before_script:
- true
script:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ WORKDIR /code

RUN python setup_letsconnect.py sdist
RUN cp dist/*.tar.gz /root/rpmbuild/SOURCES/.

RUN rpmbuild -bs rpm/letsconnect_centos7.spec
#RUN rpmbuild -bb rpm/letsconnect_centos7.spec
RUN rpmbuild -bs rpm/lets_connect_centos7.spec
RUN rpmbuild -bb rpm/lets_connect_centos7.spec

45 changes: 45 additions & 0 deletions docker/lets_connect_fedora_27_rpm
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
FROM fedora:27

RUN dnf install -y \
fedora-packager \
fedora-review \
gtk3 \
libnotify \
python2-devel \
python-gobject \
python2-configparser \
python2-future \
python2-pynacl \
python2-requests-oauthlib \
python2-cryptography \
python2-pillow \
python2-mock \
python-qrcode \
python-repoze-lru \
dbus-python \
pytest \
python3-devel \
python3-future \
python3-gobject \
python3-pynacl \
python3-requests-oauthlib \
python3-dbus \
python3-repoze-lru \
python3-mock \
python2-pytest-runner \
python3-pytest-runner \
python3-cryptography \
python3-qrcode \
python3-pillow

RUN rpmdev-setuptree

ADD . /code
WORKDIR /code

RUN python setup_letsconnect.py sdist
RUN cp dist/*.tar.gz /root/rpmbuild/SOURCES/.
RUN rpmbuild -bs rpm/lets_connect_fedora.spec
RUN rpmbuild -bb rpm/lets_connect_fedora.spec


45 changes: 45 additions & 0 deletions docker/lets_connect_fedora_28_rpm
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
FROM fedora:28

RUN dnf install -y \
fedora-packager \
fedora-review \
gtk3 \
libnotify \
python2-devel \
python-gobject \
python2-configparser \
python2-future \
python2-pynacl \
python2-requests-oauthlib \
python2-cryptography \
python2-qrcode \
python2-pillow \
python-repoze-lru \
dbus-python \
python3-devel \
python3-future \
python3-gobject \
python3-pynacl \
python3-requests-oauthlib \
python3-dbus \
python3-repoze-lru \
pytest \
python2-mock \
python3-mock \
python2-pytest-runner \
python3-pytest-runner \
python3-cryptography \
python3-qrcode \
python3-pillow

RUN rpmdev-setuptree

ADD . /code
WORKDIR /code

RUN python setup_letsconnect.py sdist
RUN cp dist/*.tar.gz /root/rpmbuild/SOURCES/.
RUN rpmbuild -bs rpm/lets_connect_fedora.spec
RUN rpmbuild -bb rpm/lets_connect_fedora.spec


4 changes: 2 additions & 2 deletions setup_letsconnect.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
}

data_files = [
('share/applications', ['share/applications/letsconnect.desktop']),
('share/applications', ['share/applications/lets-connect-client.desktop']),
('share/eduvpn', [
'share/eduvpn/eduvpn.png',
'share/eduvpn/institute.png',
Expand Down Expand Up @@ -71,7 +71,7 @@


setup(
name="letsconnect_client",
name="lets_connect_client",
version=__version__,
packages=find_packages(),
data_files=data_files,
Expand Down
File renamed without changes.

0 comments on commit 5f582b0

Please sign in to comment.