keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

packaging: More Docker fixes

Browse Source
This commit is contained in:
Colin Walters 2014-05-18 14:13:13 -04:00
parent 2756398d84
commit f203b60aa6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packaging/Dockerfile.in
View File

@ -1,5 +1,9 @@
FROM fedora:20 FROM fedora:20
RUN yum -y update RUN yum -y update
RUN cd /etc/yum.repos.d && curl -O http://copr-fe.cloud.fedoraproject.org/coprs/walters/rpm-ostree/repo/fedora-20-i386/walters-rpm-ostree-fedora-20-i386.repo
RUN yum -y install nss-altfiles
RUN rm /etc/yum.repos.d/walters-rpm-ostree-fedora-20-i386.repo
RUN sed -i -e 's,passwd:.*,\0 altfiles,' -e 's,group:.*,\0 altfiles,' /etc/nsswitch.conf
ADD @PACKAGE@ /var/tmp/@PACKAGE@ ADD @PACKAGE@ /var/tmp/@PACKAGE@
RUN yum -y localinstall /var/tmp/@PACKAGE@ RUN yum -y localinstall /var/tmp/@PACKAGE@
ENTRYPOINT rpm-ostree treecompose ENTRYPOINT ["rpm-ostree", "treecompose"]

3
packaging/Makefile.docker
View File

@ -2,7 +2,6 @@
include Makefile.dist-packaging include Makefile.dist-packaging
docker-local: rpm docker-local: rpm
rm docker -rf rm docker -rf
mkdir -p docker mkdir -p docker
@ -10,4 +9,4 @@ docker-local: rpm
sed \ sed \
-e s,\@PACKAGE\@,$(PACKAGE).rpm,g \ -e s,\@PACKAGE\@,$(PACKAGE).rpm,g \
< Dockerfile.in > docker/Dockerfile < Dockerfile.in > docker/Dockerfile
(cd docker && docker build -t cgwalters/rpm-ostree .) (set -x ;cd docker && docker build -t cgwalters/rpm-ostree .)