From 500aee5396d1ba92148061a51264e40838ee4c81 Mon Sep 17 00:00:00 2001 From: Sven Speckmaier Date: Tue, 25 Sep 2018 14:53:15 +0200 Subject: [PATCH] file version 2 -> 2.1 for cpu_period --- Dockerfile | 5 +++++ app/Blueprint/Infrastructure/Service/ServiceWriter.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8c46387..94f4039 100644 --- 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 index 1b8598a..d5d72c9 100644 --- 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) ) {