Skip to content

Commit a2c2331

Browse files
Merge pull request #152 from abnamro/2467022-update-db-image
2467022 update db image
2 parents 8fbc917 + c25cbb0 commit a2c2331

File tree

6 files changed

+39
-9
lines changed

6 files changed

+39
-9
lines changed

.github/workflows/backend-ci.yaml

+31-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ jobs:
142142
cd ${{ env.RESC_BACKEND_DIR }}
143143
docker build -t ${{ env.CONTAINER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{needs.python-build-and-publish.outputs.backend_version}} .
144144
145-
- name: Run Trivy vulnerability scanner
145+
- name: Run Trivy vulnerability scanner - RESC-Backend
146146
uses: aquasecurity/trivy-action@master
147147
with:
148148
image-ref: ${{ env.CONTAINER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{needs.python-build-and-publish.outputs.backend_version}}
@@ -197,3 +197,33 @@ jobs:
197197
context: ${{ env.RESC_BACKEND_DIR }}/
198198
push: ${{ env.PUBLISH_IMAGE }}
199199
tags: ${{ env.CONTAINER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest, ${{ env.CONTAINER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{needs.python-build-and-publish.outputs.backend_version}}
200+
201+
- name: Run Trivy vulnerability scanner - Redis
202+
uses: aquasecurity/trivy-action@master
203+
with:
204+
image-ref: redis:7.0.11-alpine
205+
format: 'table'
206+
exit-code: '0'
207+
ignore-unfixed: true
208+
vuln-type: 'os,library'
209+
severity: 'CRITICAL,HIGH'
210+
211+
- name: Run Trivy vulnerability scanner - RabbitMQ
212+
uses: aquasecurity/trivy-action@master
213+
with:
214+
image-ref: rabbitmq:3.11.9-management-alpine
215+
format: 'table'
216+
exit-code: '0'
217+
ignore-unfixed: true
218+
vuln-type: 'os,library'
219+
severity: 'CRITICAL,HIGH'
220+
221+
- name: Run Trivy vulnerability scanner - Database
222+
uses: aquasecurity/trivy-action@master
223+
with:
224+
image-ref: mcr.microsoft.com/azure-sql-edge:1.0.7
225+
format: 'table'
226+
exit-code: '0'
227+
ignore-unfixed: true
228+
vuln-type: 'os,library'
229+
severity: 'CRITICAL,HIGH'

components/resc-backend/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ If you can override the images by providing below arguments to the script.
170170
cd tests/newman_tests
171171
./run_newman_tests.sh -b <resc-backend image:tag> -d <resc-database image:tag> -n <newman image:tag>
172172

173-
Example: ./run_newman_tests.sh -b 'rescabnamro/resc-backend:latest' -d 'mcr.microsoft.com/azure-sql-edge:1.0.5' -n 'postman/newman:5.3.1-alpine'
173+
Example: ./run_newman_tests.sh -b 'rescabnamro/resc-backend:latest' -d 'mcr.microsoft.com/azure-sql-edge:1.0.7' -n 'postman/newman:5.3.1-alpine'
174174
```
175175

176176
### Run OWASP ZAP API Security tests locally:
@@ -185,7 +185,7 @@ If you can override the images by providing below arguments to the script.
185185
cd tests/zap_tests
186186
./run_run_zap_api_tests.sh -b <resc-backend image:tag> -d <resc-database image:tag> -z <zap image:tag>
187187

188-
Example: ./run_newman_tests.sh -b 'rescabnamro/resc-backend:latest' -d 'mcr.microsoft.com/azure-sql-edge:1.0.5' -n 'owasp/zap2docker-weekly'
188+
Example: ./run_newman_tests.sh -b 'rescabnamro/resc-backend:latest' -d 'mcr.microsoft.com/azure-sql-edge:1.0.7' -n 'owasp/zap2docker-weekly'
189189
```
190190

191191

components/resc-backend/tests/newman_tests/run_newman_tests.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#Description : This script runs newman tests for RESC API
55
#Args : -b <resc-backend image:tag> -d <resc-database image:tag> -n <newman image:tag>
66
#Usage 1 : ./run_newman_tests.sh -b 'rescabnamro/resc-backend:latest' \
7-
# -d 'mcr.microsoft.com/azure-sql-edge:1.0.5' \
7+
# -d 'mcr.microsoft.com/azure-sql-edge:1.0.7' \
88
# -n "postman/newman:5.3.1-alpine"
99
#Usage 2 : ./run_newman_tests.sh , default values will be used
1010
# if you don't provide any argument
@@ -24,7 +24,7 @@ do
2424
done
2525

2626
RESC_BACKEND_IMAGE="${backend_image:-"rescabnamro/resc-backend:latest"}"
27-
RESC_DATABASE_IMAGE="${database_image:-"mcr.microsoft.com/azure-sql-edge:1.0.5"}"
27+
RESC_DATABASE_IMAGE="${database_image:-"mcr.microsoft.com/azure-sql-edge:1.0.7"}"
2828
RESC_NEWMAN_IMAGE="${newman_image:-"postman/newman:5.3.1-alpine"}"
2929
RESC_BACKEND_CONTAINER="resc-api-test"
3030
RESC_DATABASE_CONTAINER="resc-database-test"

components/resc-backend/tests/zap_tests/run_zap_api_tests.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#Description : This script runs ZAP API Security tests for RESC API
55
#Args : -b <resc-backend image:tag> -d <resc-database image:tag> -z <zap image:tag>
66
#Usage 1 : ./run_zap_api_tests.sh -b 'rescabnamro/resc-backend:latest' \
7-
# -d 'mcr.microsoft.com/azure-sql-edge:1.0.5' \
7+
# -d 'mcr.microsoft.com/azure-sql-edge:1.0.7' \
88
# -z "owasp/zap2docker-weekly"
99
#Usage 2 : ./run_zap_api_tests.sh , default values will be used
1010
# if you don't provide any argument
@@ -24,7 +24,7 @@ do
2424
done
2525

2626
RESC_BACKEND_IMAGE="${backend_image:-"rescabnamro/resc-backend:latest"}"
27-
RESC_DATABASE_IMAGE="${database_image:-"mcr.microsoft.com/azure-sql-edge:1.0.5"}"
27+
RESC_DATABASE_IMAGE="${database_image:-"mcr.microsoft.com/azure-sql-edge:1.0.7"}"
2828
RESC_ZAP_IMAGE="${zap_image:-"owasp/zap2docker-weekly"}"
2929
RESC_BACKEND_CONTAINER="resc-api-test"
3030
RESC_DATABASE_CONTAINER="resc-database-test"

deployment/kubernetes/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ If any image is not getting pulled automatically from the registry, you can use
279279

280280
Examples:
281281
```bash
282-
docker pull mcr.microsoft.com/azure-sql-edge:1.0.5
282+
docker pull mcr.microsoft.com/azure-sql-edge:1.0.7
283283

284284
docker pull redis:7.0.11-alpine
285285

deployment/kubernetes/charts/resc-database/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ database:
55
image:
66
repository: mcr.microsoft.com/
77
name: azure-sql-edge
8-
tag: 1.0.5
8+
tag: 1.0.7
99
pullPolicy: IfNotPresent
1010
resources:
1111
requests:

0 commit comments

Comments
 (0)