Merge branch 'main' into moreinstancechecks

dataplat · May 9, 2023 · b3767be · b3767be
2 parents 434637d + 6c283e0
commit b3767be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
     dbachecks1:
-      image: dbachecks/sqlinstance1:v2.35.0
+      image: dbachecks/sqlinstance1:v2.36.0
       volumes:
         - mydata:/var/opt/backups
         - shared:/shared
@@ -13,7 +13,7 @@ services:
       hostname: dbachecks1
 
     dbachecks2:
-      image: dbachecks/sqlinstance2:v2.35.0
+      image: dbachecks/sqlinstance2:v2.36.0
       volumes:
         - mydata:/var/opt/backups
         - shared:/shared
@@ -27,7 +27,7 @@ services:
 
       # This is our SQL2022 container
     dbachecks3:
-      image: dbachecks/sqlinstance3:v2.35.0
+      image: dbachecks/sqlinstance3:v2.36.0
       volumes:
         - mydata:/var/opt/backups
         - shared:/shared

diff --git a/containers/base/dockerfile b/containers/base/dockerfile
@@ -2,6 +2,9 @@ FROM dbachecks/sqlinstance1
 
 USER root
 
+# remove old dbatools directory so 2.0 will import
+RUN rm -rf /usr/local/share/powershell/Modules/dbatools
+
 # Copy Profile
 
 ADD profile.ps1 /root/.config/powershell/