diff options
| author | Andrej Marolt | 2017-11-04 01:05:15 +0100 |
|---|---|---|
| committer | Andrej Marolt | 2017-11-04 19:06:20 +0100 |
| commit | 406474bbe62a94648da8f8ed5637568310788e3e (patch) | |
| tree | 2f3170257df2765284790f9ff6556ac946bc720b | |
| parent | 3740acb81e3af4f6969385bf80bc851efc3bbd60 (diff) | |
| download | aur-406474bbe62a94648da8f8ed5637568310788e3e.tar.gz | |
Upgrade due to upstream release. | Remove custom scripts.
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | config.sh | 18 |
3 files changed, 16 insertions, 20 deletions
@@ -1,7 +1,7 @@ pkgbase = openshift-origin-git pkgdesc = OpenShift Origin is a platform for developing, building, and deploying containerized applications. See https://docs.openshift.org/latest for more on running OpenShift Origin. pkgver = 1.0.0 - pkgrel = 11 + pkgrel = 12 url = https://github.com/openshift/origin install = install.sh arch = x86_64 @@ -9,6 +9,8 @@ pkgbase = openshift-origin-git makedepends = go depends = docker optdepends = zfs-dkms: zfs support + provides = openshift + conflicts = openshift source = https://github.com/openshift/origin/archive/release-3.6.zip sha256sums = SKIP @@ -1,7 +1,7 @@ # Maintainer: Andrej Marolt <andrej.marolt@gmail.com> pkgname=openshift-origin-git pkgver=1.0.0 -pkgrel=11 +pkgrel=12 pkgdesc="OpenShift Origin is a platform for developing, building, and deploying containerized applications. See https://docs.openshift.org/latest for more on running OpenShift Origin." arch=(x86_64) url="https://github.com/openshift/origin" @@ -9,6 +9,8 @@ license=('Apache') depends=('docker') makedepends=('go') optdepends=('zfs-dkms: zfs support') +provides=('openshift') +conflicts=('openshift') install=install.sh if [[ $CARCH == 'x86_64' ]]; then source=("https://github.com/openshift/origin/archive/release-3.6.zip") @@ -33,4 +35,14 @@ package() { install -D -m755 $srcdir/oc $pkgdir/usr/bin/oc install -D -m755 $srcdir/openshift $pkgdir/usr/bin/openshift install -D -m755 $srcdir/kubefed $pkgdir/usr/bin/kubefed + + echo "Running openshift post_install script..." + + ln -s /usr/bin/openshift /usr/bin/kube-apiserver + ln -s /usr/bin/openshift /usr/bin/kube-controller-manager + ln -s /usr/bin/openshift /usr/bin/kubelet + ln -s /usr/bin/openshift /usr/bin/kube-proxy + ln -s /usr/bin/openshift /usr/bin/kube-scheduler + ln -s /usr/bin/openshift /usr/bin/oadm + ln -s /usr/bin/oc /usr/bin/kubectl } diff --git a/config.sh b/config.sh deleted file mode 100644 index 8d84633073bd..000000000000 --- a/config.sh +++ /dev/null @@ -1,18 +0,0 @@ - -# this file is sourced by -# 1.install.cluster.sh -# 2.install.certificate.sh -# 3.start.cluster.sh -# 5.delete.cluster.sh - - -ORIGIN_HOME=/var/lib/origin -PUBLIC_HOSTNAME=$(hostname) -ROUTING_SUFFIX=apps.$(hostname) -ADMIN_USERNAME=$(whoami) -# VERSION=latest -# VERSION=v1.2.1 -VERSION=v1.3.0 - -#CERT_FILE=/path-to/$(hostname)/certificate -#KEY_FILE=/path-to/$(hostname)/private-key |