Fixing bug in docker build

netsells · May 13, 2020 · 5015fa4 · 5015fa4
1 parent 7c737c1
commit 5015fa4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,6 +14,9 @@ jobs:
     name: Create Release
     runs-on: ubuntu-latest
     steps:
+      - name: Get the version
+        id: get_version
+        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
       - name: Checkout code
         uses: actions/checkout@v2
 
@@ -29,7 +32,7 @@ jobs:
         run: "composer install ${{ env.COMPOSER_FLAGS }}"
 
       - name: Build Release
-        run: php netsells app:build --build-version=${{ github.ref }}
+        run: php netsells app:build --build-version=${{ steps.get_version.outputs.VERSION }}
 
       - name: Create Release
         id: create_release

diff --git a/app/Commands/DockerBuildCommand.php b/app/Commands/DockerBuildCommand.php
@@ -54,7 +54,7 @@ public function handle()
             return 1;
         }
 
-        $tag = trim($this->option('tag') ?: $this->git->currentSha());
+        $tag = trim($this->option('tag') ?: $this->helpers->git()->currentSha());
         $services = $this->helpers->console()->handleOverridesAndFallbacks(
             $this->option('service'),
             NetsellsFile::DOCKER_SERVICES,