68 Commits

Author SHA1 Message Date
Waldemar Zurowski
fa10eb39c2 ES-839: Merging forward updates from release/os/4.9 to release/os/4.10 (2023-07-18) 2023-07-18 08:49:20 +01:00
Waldemar Zurowski
e23efb0b2d ES-839: Merging forward updates from release/os/4.8 to release/os/4.9 (2023-07-17) 2023-07-17 22:57:24 +01:00
Waldemar Zurowski
36940d228f ES-839: Merging forward updates from release/os/4.7 to release/os/4.8 (2023-07-17) 2023-07-17 19:34:19 +01:00
Waldemar Żurowski
5a31ed0f23
ES-839: fix for dropping Zulu repository (#7429)
* make sure `rm` doesn't fail if the file is not present
* it makes it easier for forward merge to a branch with newer base image
without that file
2023-07-17 19:05:58 +01:00
Connel McGovern
b01f85fb11 Merge branch 'release/os/4.9' into connelm/merge-4.9-4.10-2023-07-14
# Conflicts:
#	build.gradle
2023-07-14 18:19:55 +01:00
Ronan Browne
befae353ac ES-853: Merging forward updates from 4.8 to 4.9 (2023-07-13) 2023-07-13 15:25:55 +01:00
Ronan Browne
5e3ee980b3 INFRA-2040: Merging forward updates from 4.7 to 4.8 (2023-07-05) 2023-07-05 20:54:02 +01:00
Ronan Browne
6b1a2cb027
ES-839: Disable Internal docker publishing for 4.7 ( only supported post 4.9 pacthes) (#7410)
* ES-839: Disable Docker publishing for 4.7
* ES-839: remove broken repo
2023-07-05 16:28:08 +01:00
Adel El-Beik
de76ebab23
ENT-6975: Update Zulu docker files to use Zulu JDK 352. (#7256) 2022-10-31 08:47:40 +00:00
Adel El-Beik
c23f74bc3f ENT-6975: Updated docker jdk version to 345 for zulu ubuntu and 8u342-al2 for amazon corretto. 2022-10-14 12:09:34 +01:00
Viktor Kolomeyko
c7eab9980b
NOTICK: Update Docker ReadMe.md (#7176) 2022-05-26 09:35:27 +01:00
Viktor Kolomeyko
355411b195 Merge remote-tracking branch 'origin/release/os/4.9' into vkolomeyko/cc4.9-cc4.10-merge
# Conflicts:
#	.ci/dev/regression/Jenkinsfile
#	build.gradle
2022-05-18 15:27:44 +01:00
Ronan Browne
415c068616
ENT-6753 update base images 2022-04-12 13:56:06 +01:00
Adel El-Beik
cb4c7a80ca Merge remote-tracking branch 'origin/release/os/4.9' into adel/merge-from-4.9-1stApr 2022-04-01 16:58:08 +01:00
Adel El-Beik
5a41348679 Merge branch 'release/os/4.8' into adel/merge-from-4.8-1stApr 2022-04-01 11:10:58 +01:00
Ronan Browne
89da70a205 Merge branch 'release/os/4.8' into ronanb/ENT-6699/update-java-version 2022-03-16 12:52:00 +00:00
Ronan Browne
95726b5d58 ENT-6699 update java version 2022-03-16 12:43:48 +00:00
Ronan Browne
db817ef621
ENT-6609 update docker images (#7087) 2022-02-24 10:36:00 +01:00
Ronan Browne
3f94ed66d4
ENT-6609 update docker images (#7086) 2022-02-24 10:35:31 +01:00
nargas-ritu
cd8cd60a0f NOTICK: Changes done while creating a new branch for Corda 4.10 2022-02-17 10:43:34 +00:00
Ronan Browne
0b8c46e1b2
ENT-6495: bump java base version (#7056)
* ENT-6609: update base version in line with supported java versions

* NOTICK: update java version
2022-02-08 16:22:02 +00:00
Ronan Browne
69d87df562
ENT-6495: bump java version (#7058)
* NOTICK: bump java version to later java8

* NOTICK: bump to java 8
2022-02-08 16:19:12 +00:00
Ronan Browne
2d2289b3bf
ENT-6426: update docker tagging inline with our dockerhub policies (#7027)
* ENT-6426: update docker tahhing inline with our policies

old
corda/corda-zulu-java1.8-4.8.5:latest

new
corda/corda:4.8.5-zulu-1.8

based on pattern
{repo}:{version}-{base-Image}

* ENT-6426: update docker tahhing inline with our policies

old
corda/corda-zulu-java1.8-4.8.5:latest

new
corda/corda:4.8.5-zulu-openjdk8

based on pattern
{repo}:{version}-{base-Image}

Remove some redundant code

* ENT-6426 update corda repo tagging
2022-01-19 10:34:35 +00:00
nargas-ritu
f4a022ddce NOTICK: New branch for Corda OS 4.9 2022-01-04 12:33:03 +00:00
nargas-ritu
5a13e48ea8 NOTICK: Changes done for creating new branch for 4.8 2020-11-23 14:37:14 +00:00
Walter Oggioni
734d35b719
INFRA-803 Rebuild Docker image tasks (#6804) 2020-11-20 10:21:53 +00:00
Yash Nabar
eba7fabe5e
EG-2647: Add persistent Artemis volume (#6389) 2020-06-29 14:34:53 +01:00
Tamas Veingartner
26d4bfb89f
CORDA-3578 add corda prefix to conf file names as original issue was … (#6322)
* CORDA-3578 add corda prefix to conf file names as original issue was having non-corda reference.conf files on classpath causes DriverDSLImp failure

it is better to have this naming convention and avoid further conflicts of conf files.

* fixed weird duplicates

* revert renaming changes for web-reference.conf and loadtest-reference.conf
2020-06-16 09:15:51 +01:00
nargas-ritu
ba69ab6842 Bump OS release version 4.6 2020-05-04 12:07:27 +01:00
jmacmahonr3
b989cfce43
EG-153 - Adding sshd by default to docker node.conf template (#6171)
* Adding value needed for the rapid deployment of Azure UAT enviroments
* Parameterizing Rpc user
* Removing duplicate config requirement
* Forcing users to provide sshPort for node config generation with docker image
2020-04-30 15:03:08 +01:00
Dan Newton
678fb6eb94
Merge pull request #6108 from corda/dan/os-4.4-to-4.5-merge-2020-03-26
OS 4.4 to 4.5 merge 2020-03-26
2020-03-27 09:39:41 +00:00
Dimos Raptis
963de40902
[NOTICK] - Enable check in detekt for unused imports (#6106)
* [NOTICK] - Enable check in detekt for unused imports

* Put back accidental removal of used import

* Some more accidental removals
2020-03-26 15:46:33 +00:00
LankyDan
d9c1907c88 Merge branch 'release/os/4.4' into dan/os-4.4-to-4.5-merge-2020-03-26 2020-03-26 14:26:41 +00:00
Joseph Zuniga-Daly
b766eff284 Merge remote-tracking branch 'origin/release/os/4.3' into jzd/merge-os4.3-into-os4.4-2020-03-26 2020-03-26 11:01:39 +00:00
przemolb
8f54ef740f
Merge pull request #5610 from corda/pb-add-docker-with-debug-tools
Add debug dockerfiles with additional tools useful for investigating …
2020-03-21 23:09:49 +00:00
Chris Rankin
ffa2caed32 Merge branch 'release/os/4.4' into chrisr3-44-merge 2020-03-04 16:27:44 +00:00
Stefano Franz
20c5040826
add ability to exit after config generation as is described in the docs (#6023) 2020-03-04 09:52:19 +00:00
Waldemar Żurowski
dfbf6120d2
Updating Artifactory URLs for Corda OS (#5930) (#5939) (#5941)
* Switching Artifactory URLs from obsolete ci-artifactory to software.r3.com
2020-02-11 14:39:57 +00:00
Waldemar Żurowski
e90058962f
Updating Artifactory URLs for Corda OS (#5930) (#5939)
* Switching Artifactory URLs from obsolete ci-artifactory to software.r3.com
2020-02-11 11:57:51 +00:00
Waldemar Żurowski
9ccbfe178c
Updating Artifactory URLs for Corda OS 4.3 (#5930)
* Switching Artifactory URLs from obsolete ci-artifactory to software.r3.com
2020-02-11 08:40:22 +00:00
nargas-ritu
b5d9da25ec Bump OS release version 4.5 2020-01-31 13:54:01 +00:00
Chris Rankin
5d47466051 NOTICK: Refactor Gradle script for building Docker images. (#5813) 2019-12-16 14:34:51 +00:00
Anthony Keenan
0a194cfb51 Merge branch 'release/os/4.3' into release/os/4.4
# Conflicts:
#	docs/source/docker-image.rst
2019-10-21 13:44:32 +01:00
Anthony Keenan
b9a3b3a871
CORDA-3336: Remove log4j plugins to stop errors in config generator (#5617) 2019-10-21 13:31:09 +01:00
Przemyslaw Bak
3b71a93de0 Add debug dockerfiles with additional tools useful for investigating network issues. 2019-10-17 18:03:26 +01:00
Stefano Franz
5bfdf4ce20 CORDA-3257 Docker image: do not post json to filter generated zip for testnet generation (#5598) 2019-10-17 14:31:31 +01:00
stefano
0488a5ac5d Merge remote-tracking branch 'origin/release/os/4.3' into merge_4.3_to_4.4
# Conflicts:
#	constants.properties
2019-10-08 15:57:14 +01:00
Stefano Franz
5ce0a540c8
fix config generation for testnet (#5548) 2019-10-07 13:04:11 +02:00
Chris Rankin
c0eb8c03c0 Merge commit '219624fba7e77765ede9ed6b84193736a448a553' into chrisr3-os-4-3-4.4-merge 2019-09-24 23:06:00 +01:00
Jonathan Locke
a944be7e04 NOTICK: Change build number to snapshot
Change build number back to snapshot to fix the nightly build. In future, release candidates will be cut using orphaned commits rather than changes to the underlying branch.
2019-09-20 16:45:54 +01:00