Skip to content

merge to latest 5, Rocky 8, MA #129

merged 87 commits into from Dec 18, 2023
Merged
Changes from 1 commit
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
ec2bf47
initial commit for RockyLinux
pcaskey Aug 12, 2021
140d278
comment sec test
pcaskey Aug 12, 2021
8c274d8
add security scan
pcaskey Aug 16, 2022
dfe5d50
add find (for tests)
pcaskey Aug 16, 2022
ef78ef5
fix jenkinsfile
pcaskey Aug 16, 2022
7cfe71e
jenkins fix
pcaskey Aug 16, 2022
5a4fd29
jenkins
pcaskey Aug 16, 2022
c1f3a5d
more jenkins stuff
pcaskey Aug 16, 2022
5737cb2
jenkins again
pcaskey Aug 16, 2022
cfa5bf5
jenkins too
pcaskey Aug 16, 2022
ad1d85c
jenkins fix
pcaskey Aug 16, 2022
2ed493d
tune jenkins settings
pcaskey Aug 16, 2022
4481172
comment out fatal sec scan
pcaskey Aug 16, 2022
4801f7f
initial attempt at multiarch
pcaskey Nov 2, 2022
4fdd508
just try amd64
pcaskey Nov 2, 2022
a4a11d5
mod Dockerfile
pcaskey Nov 2, 2022
c6bbc95
bugfix
pcaskey Nov 2, 2022
884176a
test
pcaskey Nov 2, 2022
9956e32
fix arch
pcaskey Nov 2, 2022
649541c
change FROM platform
chubing Nov 2, 2022
5f7458d
change way java installs
chubing Nov 2, 2022
a0dd539
add in amd64
chubing Nov 2, 2022
e8ab3c2
update rocky linux to 8.6
pcaskey Nov 2, 2022
093b295
enable trivy scan
pcaskey Nov 2, 2022
afcd5c4
remove sudo from trivy install
pcaskey Nov 3, 2022
2b51f02
Update Jenkinsfile
chubing Nov 3, 2022
30a4548
tweak image scanning
pcaskey Nov 3, 2022
3416367
Merge branch '4.2.1_20221101_rocky8_multiarch_dev' of https://github.…
pcaskey Nov 3, 2022
dcb0c6a
update Jenkinsfile
pcaskey Nov 3, 2022
c40b5fd
update Jenkinsfile
pcaskey Nov 3, 2022
529e544
re-order Jenkinsfile
pcaskey Nov 4, 2022
df3f449
delay push
pcaskey Nov 7, 2022
f4de319
multi-arch test
pcaskey Nov 7, 2022
5d9c6e4
bugfix in Jenkinsfile
pcaskey Nov 7, 2022
c89dd8a
mod Jenkinsfile, multi-stage
pcaskey Nov 7, 2022
67cc687
fix Jenkinsfile
pcaskey Nov 7, 2022
add71b2
Jenkins fix
pcaskey Nov 7, 2022
ed4d0cc
cleanup Jenkinsfile
pcaskey Nov 7, 2022
854c655
bugfix
pcaskey Nov 7, 2022
8c08252
bugfix again
pcaskey Nov 7, 2022
b0d1a69
tweak Jenkinsfile
pcaskey Nov 8, 2022
52bb6dd
attempt full-cycle test
pcaskey Nov 9, 2022
7b8a528
bugfix
pcaskey Nov 9, 2022
46d0400
fix test
pcaskey Nov 9, 2022
ee290d9
troubleshooting
pcaskey Nov 9, 2022
788e2a5
typo
pcaskey Nov 9, 2022
899fcb0
trblshtg
pcaskey Nov 9, 2022
27a056c
testing
pcaskey Nov 9, 2022
d70d3c3
more testing
pcaskey Nov 9, 2022
3f5ae46
test
pcaskey Nov 9, 2022
affdbff
back to bats
pcaskey Nov 10, 2022
959dd3d
revert
pcaskey Nov 10, 2022
f396d1f
remove new file desccriptors
pcaskey Nov 10, 2022
2fa2d5f
fix static sed command
pcaskey Nov 10, 2022
5de45d9
enable other tests
pcaskey Nov 11, 2022
418e956
chg script
pcaskey Nov 11, 2022
3880ff7
cleanup
pcaskey Nov 11, 2022
9fb83f1
add cleanup
pcaskey Nov 11, 2022
86b4cae
escape dollar signs
pcaskey Nov 11, 2022
f7d7e71
escape quotes
pcaskey Nov 11, 2022
c1b0686
fun with escaping in Jenkins
pcaskey Nov 11, 2022
965ca28
fix cleanup
pcaskey Nov 11, 2022
00413fa
Update Dockerfile
pcaskey Nov 17, 2022
ec3d5c7
bump java, tomcat
pcaskey Dec 14, 2022
f0806cd
bump IdP to 4.3.0 and tomcat to 9.0.71
pcaskey Jan 18, 2023
966148a
update scan command
pcaskey Jan 18, 2023
0437409
bugfix
pcaskey Jan 18, 2023
82a7bb9
another scan tweak
pcaskey Jan 18, 2023
abe361d
add JSTL
pcaskey Feb 9, 2023
47a7a78
bump tomcat, fix tests
pcaskey Mar 13, 2023
ca3c572
bump IdP to 4.3.1
pcaskey Mar 30, 2023
b6cf569
bump Tomcat to 9.0.75
pcaskey May 25, 2023
1731116
bump tomcat to 9.0.76
pcaskey Jul 6, 2023
c1a3591
idp 5 initial commit
pcaskey Aug 11, 2023
ffee0e8
bump Rocky ver to 8.8
pcaskey Aug 11, 2023
331a304
fix tomcat ver test
pcaskey Aug 11, 2023
59e2fba
comment IdP ver test
pcaskey Aug 11, 2023
4d9cdc7
bump to released IdP 5.0.0
pcaskey Sep 14, 2023
8d9322f
fix plugin, re-enable test
pcaskey Sep 14, 2023
169bf6f
update tomcat
pcaskey Oct 12, 2023
5e13ae0
bugfix
pcaskey Oct 12, 2023
5d29b1a
fix tests
pcaskey Oct 12, 2023
9b37b3c
bump Tomcat to 10.1.16
pcaskey Nov 28, 2023
7894f76
Merge pull request #124 from docker/5.0.0_20231128_rocky8_multiarch
pcaskey Nov 28, 2023
f2e18db
bump tomcat to 10.1.17
pcaskey Dec 18, 2023
b557430
Merge pull request #127 from docker/5.0.0_20231218_rocky8_multiarch
pcaskey Dec 18, 2023
0466361
Merge branch 'master' into latest5
pcaskey Dec 18, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
comment IdP ver test
pcaskey committed Aug 11, 2023
commit 59e2fbaf3ca3bbfb01e585a74e35f88a7fb54b5d
6 changes: 3 additions & 3 deletions tests/main.bats
@@ -42,9 +42,9 @@ load ../common
./tests/checktomcatver.sh ${imagename}_${tag}
}

@test "060 The version of the IdP is current" {
./tests/checkidpver.sh ${imagename}_${tag}
}
#@test "060 The version of the IdP is current" {
# ./tests/checkidpver.sh ${imagename}_${tag}
#}

@test "070 The IdP successfully completed a full-cycle test with an SP" {
./tests/fulltest.sh