Merge pull request #298 from tighten/fix/tm-mssql-arm

Changed the MSSQL image for one that works on M1
tighten · May 30, 2023 · 2e304df · 2e304df
2 parents e2dd015 + 43eb799
commit 2e304df
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 29 deletions.
diff --git a/app/Services/MsSql.php b/app/Services/MsSql.php
@@ -9,7 +9,7 @@ class MsSql extends BaseService
     protected static $category = Category::DATABASE;
 
     protected $organization = 'mcr.microsoft.com';
-    protected $imageName = 'mssql/server';
+    protected $imageName = 'azure-sql-edge';
     protected $dockerTagsClass = MicrosoftDockerTags::class;
     protected $defaultPort = 1433;
     protected $prompts = [

diff --git a/app/Shell/MicrosoftDockerTags.php b/app/Shell/MicrosoftDockerTags.php
@@ -3,7 +3,6 @@
 namespace App\Shell;
 
 use Illuminate\Support\Collection;
-use Illuminate\Support\Str;
 
 class MicrosoftDockerTags extends DockerTags
 {
@@ -16,9 +15,7 @@ public function getTags(): Collection
     {
         return collect(json_decode($this->getTagsResponse(), true)['tags'])
             ->reverse()
-            ->filter(function ($tag) {
-                return Str::contains($tag, '-GA-');
-            });
+            ->values();
     }
 
     protected function tagsUrlTemplate(): string

diff --git a/tests/Feature/MicrosoftDockerTagsTest.php b/tests/Feature/MicrosoftDockerTagsTest.php
@@ -11,29 +11,6 @@
 
 class MicrosoftDockerTagsTest extends TestCase
 {
-    /** @test */
-    function it_gets_a_general_availability_release()
-    {
-        $dockerTags = app(MicrosoftDockerTags::class, ['service' => app(MsSql::class)]);
-        $this->assertStringContainsString('-GA-', $dockerTags->getLatestTag());
-    }
-
-    /** @test */
-    function it_ignores_tags_without_ga_string()
-    {
-        $mssql = app(MsSql::class);
-        $dockerTags = M::mock(MicrosoftDockerTags::class, [app(Client::class), $mssql])
-            ->makePartial()
-            ->shouldAllowMockingProtectedMethods();
-
-        $dockerTags->shouldReceive('getTagsResponse')->andReturn(new MicrosoftDockerTagsFakestream('abc'));
-
-        $tags = $dockerTags->getTags();
-
-        $this->assertEquals(2, $tags->count());
-        $this->assertStringContainsString('-GA-', $tags->first());
-    }
-
     /** @test */
     function it_reverses_tag_list()
     {
@@ -44,6 +21,6 @@ function it_reverses_tag_list()
 
         $dockerTags->shouldReceive('getTagsResponse')->andReturn(new MicrosoftDockerTagsFakestream('abc'));
 
-        $this->assertEquals('2024-GA-ubuntu-18.04', $dockerTags->getLatestTag());
+        $this->assertEquals('latest', $dockerTags->getLatestTag());
     }
 }