Refactoring the structure of our images

[people/jschlag/pbs-docker.git] / src / pakfire / setup-org.sh

diff --git a/src/pbs-web/setup-org.sh b/src/pakfire/setup-org.sh
similarity index 51%
rename from src/pbs-web/setup-org.sh
rename to src/pakfire/setup-org.sh
index 3b79545047f431fac8f21b80094d5a62afd473c0..2c67062ad38a3e62951e4580fea4a3fb1c1bb4e0 100644 (file)
--- a/src/pbs-web/setup-org.sh
+++ b/src/pakfire/setup-org.sh
@@ -17,14 +17,13 @@ log "Update all packages"
 yum update -y
 log "Installing epel"
 yum install -y epel-release
-log "Installing packages for build"
-yum install -y git gcc make intltool autoconf libtool libtool-devel libcap-devel libsolv-devel python-devel xz-devel
-log "Installing dependencies"
-yum install -y python-daemon python-tornado libcap libsolv xz
+build_deps="git gcc make autoconf libtool intltool libcap-devel libsolv-devel python-devel xz-devel"
+deps="libcap libsolv xz python"
 
-# add a user
-groupadd -g 2000 pbs
-useradd --system --no-create-home --shell /bin/bash --uid 2000 --gid 2000 pbs
+log "Installing dependencies"
+yum install -y ${deps}
+log "Installing packages for build"
+yum install -y ${build_deps}
 
 mkdir -p /opt/dev
 log "Building pakfire"
@@ -36,16 +35,8 @@ cd pakfire
 make
 make install
 
-log "Installing the pbs"
-cd /opt/
-git clone -b master  http://git.ipfire.org/pub/git/pbs.git
-cd pbs
-chmod +x pakfire-web
-
 # cleanup
-yum remove -y git gcc make intltool autoconf libtool libtool-devel
+yum remove -y ${build_deps}
 yum autoremove -y
 yum clean all
-rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /opt/dev/*
-
-# set permissions
+rm -rf /var/tmp/* /var/cache/yum/* /opt/dev/*