Skip to content

Merge main into vNext#535

Merged
tjwatson merged 25 commits into
vNextfrom
vNextMergeMain
Aug 9, 2023
Merged

Merge main into vNext#535
tjwatson merged 25 commits into
vNextfrom
vNextMergeMain

Conversation

@tjwatson

@tjwatson tjwatson commented Aug 9, 2023

Copy link
Copy Markdown
Member

No description provided.

wraschke and others added 25 commits June 30, 2023 14:33
Update Ubuntu full images to use tag in FROM
remove ARG substitution in FROM for Ubuntu full
If the server fails to start when populating the SCC we should
gracefully fail the build. Because the populate_scc.sh script sets
the -e shell option, the shell will exit if any command returns
non-zero, except in certain cases.

The populate_scc.sh script starts and stops the server in a
compound expression using &&, which is one such case
where a non-zero return from `server start` will be ignored.

Executing `server start` and `server stop` separately fixes this
and has the desired behaviour; if the server fails to start execution
will stop and the build will fail, rather than continuing on and
leading to undefined behaviour.

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
revert ubuntu based images back to single stage
)

Signed-off-by: Leo Christy Jesuraj <leojc@ca.ibm.com>
* Fix bugs/formating in verify script

* Move from Ubuntu 20.04 (focal) to 22.04 (jammy)
Signed-off-by: Leo Christy Jesuraj <leojc@ca.ibm.com>
Merge changes from vNext to main
Signed-off-by: Leo Christy Jesuraj <leojc@ca.ibm.com>
Signed-off-by: Leo Christy Jesuraj <leojc@ca.ibm.com>
Switch Ubuntu based images for 23.0.0.7 and above to jammy (22.04)
@tjwatson tjwatson requested a review from wraschke August 9, 2023 18:18
@tjwatson tjwatson merged commit 78ac971 into vNext Aug 9, 2023
@tjwatson tjwatson deleted the vNextMergeMain branch August 10, 2023 12:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants