Skip to content

Commit

Permalink
bump mssql version and specify the platform so mac arm chips don't co…
Browse files Browse the repository at this point in the history
…mplain
  • Loading branch information
phillip-stephens committed Jan 24, 2025
1 parent 00b8e7d commit 7fbd750
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion integration_tests/mssql/cleanup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set +e

CONTAINER_NAME="zgrab_mssql-2017-linux"
CONTAINER_NAME="zgrab_mssql-2022-linux"

echo "mssql/cleanup: Tests cleanup for mssql"

Expand Down
6 changes: 3 additions & 3 deletions integration_tests/mssql/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
echo "mssql/setup: Tests setup for mssql"

CONTAINER_IMAGE="mcr.microsoft.com/mssql/server"
CONTAINER_VERSION="2017-latest"
CONTAINER_NAME="zgrab_mssql-2017-linux"
CONTAINER_VERSION="2022-latest"
CONTAINER_NAME="zgrab_mssql-2022-linux"

# Supported MSSQL_PRODUCT_ID values are Developer, Express, Standard, Enterprise, EnterpriseCore
MSSQL_PRODUCT_ID="Enterprise"
Expand All @@ -14,7 +14,7 @@ if docker ps --filter "name=$CONTAINER_NAME" | grep $CONTAINER_NAME; then
exit 0
fi

docker run -td --rm -e "MSSQL_PID=$MSSQL_PRODUCT_ID" -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=$(openssl rand -base64 12)" --name $CONTAINER_NAME $CONTAINER_IMAGE:$CONTAINER_VERSION
docker run -td --rm -e "MSSQL_PID=$MSSQL_PRODUCT_ID" -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=$(openssl rand -base64 12)" --platform "linux/amd64" --name $CONTAINER_NAME $CONTAINER_IMAGE:$CONTAINER_VERSION

echo -n "mssql/setup: Waiting on $CONTAINER_NAME..."

Expand Down
4 changes: 2 additions & 2 deletions integration_tests/mssql/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ TEST_ROOT=$MODULE_DIR/..
ZGRAB_ROOT=$(git rev-parse --show-toplevel)
ZGRAB_OUTPUT=$ZGRAB_ROOT/zgrab-output

CONTAINER_NAME="zgrab_mssql-2017-linux"
CONTAINER_NAME="zgrab_mssql-2022-linux"

mkdir -p $ZGRAB_OUTPUT/mssql

OUTPUT_FILE="$ZGRAB_OUTPUT/mssql/2017-linux.json"
OUTPUT_FILE="$ZGRAB_OUTPUT/mssql/2022-linux.json"

echo "mssql/test: Tests runner for mssql"
CONTAINER_NAME=$CONTAINER_NAME $ZGRAB_ROOT/docker-runner/docker-run.sh mssql > $OUTPUT_FILE
Expand Down

0 comments on commit 7fbd750

Please sign in to comment.