update Dockerfile to F22

pull/41/head
Pavol Rusnak 9 years ago
parent 3fc31bfe9c
commit d461a15b01

@ -1,35 +1,17 @@
# initialize from the image
FROM fedora:21
FROM fedora:22
# update package repositories
RUN yum install -y deltarpm yum-plugin-fastestmirror
RUN yum update -y
RUN dnf update -y
# install tools
RUN yum install -y cmake make wget
RUN yum install -y gcc gcc-c++ git make patchutils pkgconfig wget
RUN dnf install -y cmake make wget
RUN dnf install -y gcc gcc-c++ git make patchutils pkgconfig wget
# install dependencies for Linux packaging
RUN yum install -y ruby-devel rubygems rpm-build
RUN dnf install -y ruby-devel rubygems rpm-build
RUN gem install fpm --no-document
# install dependencies for Linux build
#RUN yum install -y glibc-devel glibc-static libgcc libstdc++-static zlib-devel
#RUN yum install -y boost-static libusbx-devel protobuf-static
#RUN yum install -y glibc-devel.i686 glibc-static.i686 libgcc.i686 libstdc++-static.i686 zlib-devel.i686
#RUN yum install -y boost-static.i686 libusbx-devel.i686 protobuf-static.i686
# protobuf-static does not install protobuf-devel, workaround
#RUN yum install -y protobuf-devel
# install used networking libraries
#RUN yum install -y libcurl-devel libmicrohttpd-devel
#RUN yum install -y libcurl-devel.i686 libmicrohttpd-devel.i686

@ -6,7 +6,6 @@ cd $(dirname $0)
VERSION="1"
install -D -m 0644 ./trezor.rules ./lib/udev/rules.d/52-trezor-extension.rules
NAME=trezor-udev
@ -22,7 +21,7 @@ for TYPE in "deb" "rpm"; do
-v $VERSION \
--license "LGPL-3.0" \
--vendor "SatoshiLabs" \
--description "Udev rules for using Bitcoin Trezor on Linux" \
--description "Udev rules for TREZOR" \
--maintainer "SatoshiLabs <stick@satoshilabs.com>" \
--url "http://bitcointrezor.com/" \
--category "Productivity/Security" \

Loading…
Cancel
Save