Skip to content

Commit 3b8696f

Browse files
john-odonnellGitHub Enterprise
authored andcommitted
Merge pull request #10 from Conjur-Enterprise/CNJR-4105-internal-url-scan
CNJR-0000: Add url scanning to pipeline
2 parents ec7da60 + 0937061 commit 3b8696f

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

CHANGELOG.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
66

77
## [Unreleased]
88

9-
## [0.1.1] - 2024-02-16
9+
## [0.1.1] - 2024-03-14
10+
11+
### Added
12+
- Add proxy parameter for http requests to Conjur (ONYX-48020)
1013

1114
### Security
1215
- Upgrade ubuntu base image in Dockerfile.test to 23.04
@@ -40,8 +43,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
4043
[conjur-api-python#19](https://github.com/cyberark/conjur-api-python/pull/19)
4144
- The `get_server_info` method is now available in SDK. It is only supported against Conjur enterprise server
4245
[conjur-api-python#19](https://github.com/cyberark/conjur-api-python/pull/19)
43-
- Add proxy parameter for http requests to Conjur
44-
[conjur-api-python#2](https://github.cyberng.com/Conjur-Enterprise/conjur-api-python/pull/2)
4546

4647
### Changed
4748
- Include system truststore certs even if cert_file config is present

Jenkinsfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,14 @@ pipeline {
5959
}
6060
}
6161

62+
stage('Scan for internal URLs') {
63+
steps {
64+
script {
65+
detectInternalUrls()
66+
}
67+
}
68+
}
69+
6270
stage('Get InfraPool ExecutorV2 Agent') {
6371
steps {
6472
script {

ci/test/conjur-deployment/ubuntu_compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ services:
124124
- ${PWD}:/opt/conjur-api-python
125125

126126
conjur-appliance:
127-
image: registry2.itci.conjur.net/conjur-appliance:5.0-stable
127+
image: registry.tld/conjur-appliance:5.0-stable
128128
ports:
129129
- "444:443"
130130
expose:

0 commit comments

Comments
 (0)