Skip to content

Commit 4e4f8ad

Browse files
Merge pull request #980 from dataplat/containers
Merge containers into main [skip ci]
2 parents 48ed8e7 + fd587c7 commit 4e4f8ad

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.devcontainer/docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: "3"
22
services:
33
dbachecks1:
4-
image: dbachecks/sqlinstance1:v2.37.0
4+
image: dbachecks/sqlinstance1:v2.38.0
55
volumes:
66
- mydata:/var/opt/backups
77
- shared:/shared
@@ -13,7 +13,7 @@ services:
1313
hostname: dbachecks1
1414

1515
dbachecks2:
16-
image: dbachecks/sqlinstance2:v2.37.0
16+
image: dbachecks/sqlinstance2:v2.38.0
1717
volumes:
1818
- mydata:/var/opt/backups
1919
- shared:/shared
@@ -27,7 +27,7 @@ services:
2727

2828
# This is our SQL2022 container
2929
dbachecks3:
30-
image: dbachecks/sqlinstance3:v2.37.0
30+
image: dbachecks/sqlinstance3:v2.38.0
3131
volumes:
3232
- mydata:/var/opt/backups
3333
- shared:/shared

.github/workflows/PR.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
path: ${{ env.buildFolderName }}
6060
- name: Run Tests
6161
shell: pwsh
62-
run: ./build.ps1 -tasks noop; ipmo dbatools ; ./build.ps1 -tasks test # to get around dbatools failing to load XE.core.dll if
62+
run: ./build.ps1 -tasks noop ; ./build.ps1 -tasks test # to get around dbatools failing to load XE.core.dll if
6363
- name: Publish Test Artifact
6464
uses: actions/upload-artifact@v3
6565
with:

containers/base/dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM dbachecks/sqlinstance1
33
USER root
44

55
# remove old dbatools directory so 2.0 will import
6-
RUN rm -rf /usr/local/share/powershell/Modules/dbatools
6+
RUN rm -rf /usr/local/share/powershell/Modules/dbatools/1.1.145
77

88
# Copy Profile
99

0 commit comments

Comments
 (0)