Skip to content

Commit 0c31fb2

Browse files
repalce docker-compose
1 parent 7d7db99 commit 0c31fb2

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

scripts/ValidateCode.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ fi
88

99
echo "App health check" # Check to see if the app container is running or not
1010
sleep 5
11-
docker-compose exec -T ${CONTAINER_NAME} python -c "import requests; requests.get('http://localhost:8000/health')" || exit 1
11+
docker compose exec -T ${CONTAINER_NAME} python -c "import requests; requests.get('http://localhost:8000/health')" || exit 1
1212

1313
echo "Openapi link" # copy openapi files to samba mount
14-
docker-compose exec -T ${CONTAINER_NAME} python -c "import requests; f=open('${CLEAN_BRANCH_NAME}_openapi.json','w',encoding = 'utf-8'); f.write(requests.get('http://localhost:8000${FAST_PARA}/openapi.json').text);f.close()"
14+
docker compose exec -T ${CONTAINER_NAME} python -c "import requests; f=open('${CLEAN_BRANCH_NAME}_openapi.json','w',encoding = 'utf-8'); f.write(requests.get('http://localhost:8000${FAST_PARA}/openapi.json').text);f.close()"
1515
[ -d "/mnt/samba/${APP_NAME}" ] || mkdir -p "/mnt/samba/${APP_NAME}"
16-
docker cp "$(docker-compose ps -q ${CONTAINER_NAME})":"/python/app/${CLEAN_BRANCH_NAME}_openapi.json" "/mnt/samba/${APP_NAME}/${CLEAN_BRANCH_NAME}_openapi.json"
16+
docker cp "$(docker compose ps -q ${CONTAINER_NAME})":"/python/app/${CLEAN_BRANCH_NAME}_openapi.json" "/mnt/samba/${APP_NAME}/${CLEAN_BRANCH_NAME}_openapi.json"
1717

1818
if [[ -z $DEV_ARG ]]
1919
then
@@ -28,14 +28,14 @@ echo "Code tests"
2828
## Typing, linting, formatting check & unit and integration testing
2929
if [[ $CONTAINER_NAME != "webapp" ]]; then
3030
echo "flake8 tests" #TODO: remove the if else block once the errors on sb-pim are fixed
31-
docker-compose exec -T ${CONTAINER_NAME} flake8; STATUS1=$? # For Sb-pim only
31+
docker compose exec -T ${CONTAINER_NAME} flake8; STATUS1=$? # For Sb-pim only
3232
else
33-
docker-compose exec -T ${CONTAINER_NAME} validatecodeonce; STATUS1=$?
34-
docker cp "$(docker-compose ps -q ${CONTAINER_NAME})":/python/reports/typing.xml typing.xml
35-
docker cp "$(docker-compose ps -q ${CONTAINER_NAME})":/python/reports/unittesting.xml unittesting.xml
36-
docker cp "$(docker-compose ps -q ${CONTAINER_NAME})":/python/reports/coverage.xml coverage.xml
33+
docker compose exec -T ${CONTAINER_NAME} validatecodeonce; STATUS1=$?
34+
docker cp "$(docker compose ps -q ${CONTAINER_NAME})":/python/reports/typing.xml typing.xml
35+
docker cp "$(docker compose ps -q ${CONTAINER_NAME})":/python/reports/unittesting.xml unittesting.xml
36+
docker cp "$(docker compose ps -q ${CONTAINER_NAME})":/python/reports/coverage.xml coverage.xml
3737
fi
3838

3939
## Return the status code
4040
TOTAL=$((STATUS1))
41-
exit $TOTAL
41+
exit $TOTAL

0 commit comments

Comments
 (0)