file version 2 -> 2.1 for cpu_period

ipunkt · Sep 25, 2018 · 500aee5 · 500aee5
1 parent 2233a7d
commit 500aee5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -35,6 +35,11 @@ RUN curl -sSL "https://github.com/rancher/rancher-compose/releases/download/v$RA
 	&& mv rancher-compose-*/rancher-compose /usr/local/bin/ \
 	&& cp /usr/local/bin/rancher-compose /usr/local/bin/rancher-compose-$RANCHER_COMPOSE_VERSION
 
+RUN curl -sSL "https://github.com/rancher/rancher-compose/releases/download/v$RANCHER_COMPOSE_VERSION/rancher-compose-linux-amd64-v$RANCHER_COMPOSE_VERSION.tar.gz" \
+	| tar xz \
+	&& mv rancher-compose-*/rancher-compose /usr/local/bin/ \
+	&& cp /usr/local/bin/rancher-compose /usr/local/bin/rancher-compose-$RANCHER_COMPOSE_VERSION
+
 COPY ["docker", "/opt/rancherize"]
 COPY [".", "/opt/rancherize-package"]
 WORKDIR /opt/rancherize

diff --git a/app/Blueprint/Infrastructure/Service/ServiceWriter.php b/app/Blueprint/Infrastructure/Service/ServiceWriter.php
@@ -243,7 +243,7 @@ protected function writeYaml($targetFile, Service $service, FileWriter $fileWrit
 		try {
 			$dockerData = Yaml::parse($this->fileLoader->get($targetFile));
 			if(!is_array($dockerData))
-				$dockerData = [ 'version' => '2' ];
+				$dockerData = [ 'version' => '2.1' ];
 
 			// handle v2 format
 			if ( array_key_exists('version', $dockerData) ) {