Reverted to using prebuilt Trams database

DFE-Digital · Mar 23, 2023 · 30ff505 · 30ff505
1 parent d00c196
commit 30ff505
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 42 deletions.
diff --git a/.github/workflows/continuous-integration-dotnet.yml b/.github/workflows/continuous-integration-dotnet.yml
@@ -27,7 +27,7 @@ jobs:
       run: |
         cp .env.database.example .env.database
         cp .env.example .env.development
-        docker compose -f "docker-compose.yml" up -d --build db sqlcmd
+        docker compose -f "docker-compose.yml" up -d --build db
 
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
@@ -62,12 +62,6 @@ jobs:
     - name: Restore dependencies
       run: dotnet restore TramsDataApi.sln
 
-    - name: Run TramsDbContext database migrations
-      run: dotnet ef database update --connection ${{ env.CONNECTION_STRING }} --context TramsDataApi.DatabaseModels.TramsDbContext
-
-    - name: Run LegacyTramsDbContext database migrations
-      run: dotnet ef database update --connection ${{ env.CONNECTION_STRING }} --context TramsDataApi.DatabaseModels.LegacyTramsDbContext
-
     - name: Build, Test and Analyze
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,31 +10,18 @@ services:
     restart: always
     depends_on:
       - db
-      - sqlcmd
     env_file:
       - .env.development
     networks:
       - dev
 
   db:
-    image: mcr.microsoft.com/azure-sql-edge:latest
+    image: ghcr.io/dfe-digital/trams-development-database:sql-2022
     env_file: .env.database
     ports:
       - 1433:1433
     networks:
       - dev
 
-  sqlcmd:
-    image: mcr.microsoft.com/mssql-tools:latest
-    env_file: .env.database
-    command: /etc/docker-entrypoint.sh
-    depends_on:
-      - db
-    stdin_open: true
-    volumes:
-      - ./script/sqlcmd-docker-entrypoint.sh:/etc/docker-entrypoint.sh
-    networks:
-      - dev
-
 networks:
   dev:
diff --git a/initial b/initial
diff --git a/script/sqlcmd-docker-entrypoint.sh b/script/sqlcmd-docker-entrypoint.sh