Merge branch 'master' of gitlab.com:gitlab-org/omnibus-gitlab into 6-8-stable

Jacob Vosmaer
2 parents 5a2891f9 952d56ad
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
Makefile
@@ -2,7 +2,7 @@ PROJECT=gitlab
 RELEASE_BUCKET=downloads-packages
 RELEASE_BUCKET_REGION=eu-west-1
 SECRET_DIR:=$(shell openssl rand -hex 20)
-PLATFORM_DIR:=$(shell bin/ohai platform | ruby -rjson -e 'puts JSON.parse(ARGF.read).first')
+PLATFORM_DIR:=$(shell ruby -rjson -e 'puts JSON.parse(`bin/ohai`).values_at("platform", "platform_version").join("-")')
  
 build:
 	OMNIBUS_APPEND_TIMESTAMP=0 bin/omnibus build project ${PROJECT}
...	...	@@ -2,7 +2,7 @@ PROJECT=gitlab
2	2	RELEASE_BUCKET=downloads-packages
3	3	RELEASE_BUCKET_REGION=eu-west-1
4	4	SECRET_DIR:=$(shell openssl rand -hex 20)
5		-PLATFORM_DIR:=$(shell bin/ohai platform \| ruby -rjson -e 'puts JSON.parse(ARGF.read).first')
	5	+PLATFORM_DIR:=$(shell ruby -rjson -e 'puts JSON.parse(`bin/ohai`).values_at("platform", "platform_version").join("-")')
6	6
7	7	build:
8	8	OMNIBUS_APPEND_TIMESTAMP=0 bin/omnibus build project ${PROJECT}
...	...