Skip to content

feat: add node 24 docker image support #1179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
o-liver wants to merge 1 commit into
base: master
Choose a base branch
from
+122 −1
Open

feat: add node 24 docker image support #1179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 121 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,38 @@
echo "$CLOUD_MTA_BOT_GITHUB_TOKEN" | docker login "ghcr.io" --username $CLOUD_MTA_BOT_USER --password-stdin
sh $PWD/scripts/publish_image 17.0.13 22.12.0 ${MBT_VERSION} "ghcr.io/sap"

publish-to-dockerhub-java17-node24:
docker:
- image: cimg/go:1.21
working_directory: ~/go/src/github.com/SAP/cloud-mta-build-tool
steps:
- checkout
- setup_remote_docker:
version: 20.10.24
- run:
name: build image pre-setup
command: |
#Make sure HEAD points to master

Check warning on line 584 in .circleci/config.yml

View check run for this annotation

In Solidarity / Inclusive Language

Match Found 


Please consider an alternative to `master`. 
Possibilities include: `primary`, `main`, `leader`, `active`, `writer`
Raw output 
/\b(?!masterdata|masterdata\w+\b)master/gi
git checkout master

Check warning on line 585 in .circleci/config.yml

View check run for this annotation

In Solidarity / Inclusive Language

Match Found 


Please consider an alternative to `master`. 
Possibilities include: `primary`, `main`, `leader`, `active`, `writer`
Raw output 
/\b(?!masterdata|masterdata\w+\b)master/gi
git fetch
git rebase
- run:
name: build Java 17.0.13 & Node 24.7.0 image
command: |
MBT_VERSION=$(cat ./VERSION)
sh $PWD/scripts/build_image 17.0.13 24.7.0 ${MBT_VERSION}
- run:
name: publish Java 17.0.13 & Node 24.7.0 image
command: |
MBT_VERSION=$(cat ./VERSION)
echo "Image release: ${MBT_VERSION}"
#Push to Docker Hub
echo "$DOCKER_HUB_TOKEN" | docker login --username $DOCKER_HUB_USER --password-stdin
sh $PWD/scripts/publish_image 17.0.13 24.7.0 ${MBT_VERSION} "devxci"
#Push to GitHub Container Registry
echo "$CLOUD_MTA_BOT_GITHUB_TOKEN" | docker login "ghcr.io" --username $CLOUD_MTA_BOT_USER --password-stdin
sh $PWD/scripts/publish_image 17.0.13 24.7.0 ${MBT_VERSION} "ghcr.io/sap"

publish-to-dockerhub-java19-node14:
docker:
- image: cimg/go:1.21
Expand Down Expand Up @@ -791,6 +823,37 @@
#Push to GitHub Container Registry
echo "$CLOUD_MTA_BOT_GITHUB_TOKEN" | docker login "ghcr.io" --username $CLOUD_MTA_BOT_USER --password-stdin
sh $PWD/scripts/publish_image 21.0.4 22.12.0 ${MBT_VERSION} "ghcr.io/sap"
publish-to-dockerhub-java21-node24:
docker:
- image: cimg/go:1.21
working_directory: ~/go/src/github.com/SAP/cloud-mta-build-tool
steps:
- checkout
- setup_remote_docker:
version: 20.10.24
- run:
name: build image pre-setup
command: |
#Make sure HEAD points to master

Check warning on line 837 in .circleci/config.yml

View check run for this annotation

In Solidarity / Inclusive Language

Match Found 


Please consider an alternative to `master`. 
Possibilities include: `primary`, `main`, `leader`, `active`, `writer`
Raw output 
/\b(?!masterdata|masterdata\w+\b)master/gi
git checkout master

Check warning on line 838 in .circleci/config.yml

View check run for this annotation

In Solidarity / Inclusive Language

Match Found 


Please consider an alternative to `master`. 
Possibilities include: `primary`, `main`, `leader`, `active`, `writer`
Raw output 
/\b(?!masterdata|masterdata\w+\b)master/gi
git fetch
git rebase
- run:
name: build Java 21.0.4 & Node 24.7.0 image
command: |
MBT_VERSION=$(cat ./VERSION)
sh $PWD/scripts/build_image 21.0.4 24.7.0 ${MBT_VERSION}
- run:
name: publish Java 21.0.4 & Node 24.7.0 image
command: |
MBT_VERSION=$(cat ./VERSION)
echo "Image release: ${MBT_VERSION}"
#Push to Docker Hub
echo "$DOCKER_HUB_TOKEN" | docker login --username $DOCKER_HUB_USER --password-stdin
sh $PWD/scripts/publish_image 21.0.4 24.7.0 ${MBT_VERSION} "devxci"
#Push to GitHub Container Registry
echo "$CLOUD_MTA_BOT_GITHUB_TOKEN" | docker login "ghcr.io" --username $CLOUD_MTA_BOT_USER --password-stdin
sh $PWD/scripts/publish_image 21.0.4 24.7.0 ${MBT_VERSION} "ghcr.io/sap"
publish-to-dockerhub-java23-node18:
docker:
- image: cimg/go:1.21
Expand Down Expand Up @@ -886,6 +949,37 @@
#Push to GitHub Container Registry
echo "$CLOUD_MTA_BOT_GITHUB_TOKEN" | docker login "ghcr.io" --username $CLOUD_MTA_BOT_USER --password-stdin
sh $PWD/scripts/publish_image 23.0.1 22.12.0 ${MBT_VERSION} "ghcr.io/sap"
publish-to-dockerhub-java23-node24:
docker:
- image: cimg/go:1.21
working_directory: ~/go/src/github.com/SAP/cloud-mta-build-tool
steps:
- checkout
- setup_remote_docker:
version: 20.10.24
- run:
name: build image pre-setup
command: |
#Make sure HEAD points to master

Check warning on line 963 in .circleci/config.yml

View check run for this annotation

In Solidarity / Inclusive Language

Match Found 


Please consider an alternative to `master`. 
Possibilities include: `primary`, `main`, `leader`, `active`, `writer`
Raw output 
/\b(?!masterdata|masterdata\w+\b)master/gi
git checkout master

Check warning on line 964 in .circleci/config.yml

View check run for this annotation

In Solidarity / Inclusive Language

Match Found 


Please consider an alternative to `master`. 
Possibilities include: `primary`, `main`, `leader`, `active`, `writer`
Raw output 
/\b(?!masterdata|masterdata\w+\b)master/gi
git fetch
git rebase
- run:
name: build Java 23.0.1 & Node 24.7.0 image
command: |
MBT_VERSION=$(cat ./VERSION)
sh $PWD/scripts/build_image 23.0.1 24.7.0 ${MBT_VERSION}
- run:
name: publish Java 23.0.1 & Node 24.7.0 image
command: |
MBT_VERSION=$(cat ./VERSION)
echo "Image release: ${MBT_VERSION}"
#Push to Docker Hub
echo "$DOCKER_HUB_TOKEN" | docker login --username $DOCKER_HUB_USER --password-stdin
sh $PWD/scripts/publish_image 23.0.1 24.7.0 ${MBT_VERSION} "devxci"
#Push to GitHub Container Registry
echo "$CLOUD_MTA_BOT_GITHUB_TOKEN" | docker login "ghcr.io" --username $CLOUD_MTA_BOT_USER --password-stdin
sh $PWD/scripts/publish_image 23.0.1 24.7.0 ${MBT_VERSION} "ghcr.io/sap"
remove-github-release-tag:
docker:
- image: cimg/go:1.21
Expand Down Expand Up @@ -1165,6 +1259,14 @@
only: /release/
branches:
ignore: /.*/
- publish-to-dockerhub-java17-node24:
requires:
- publish-to-npm
filters:
tags:
only: /release/
branches:
ignore: /.*/
- publish-to-dockerhub-java19-node14:
requires:
- publish-to-npm
Expand Down Expand Up @@ -1221,6 +1323,14 @@
only: /release/
branches:
ignore: /.*/
- publish-to-dockerhub-java21-node24:
requires:
- publish-to-npm
filters:
tags:
only: /release/
branches:
ignore: /.*/
- publish-to-dockerhub-java23-node18:
requires:
- publish-to-npm
Expand All @@ -1245,6 +1355,14 @@
only: /release/
branches:
ignore: /.*/
- publish-to-dockerhub-java23-node24:
requires:
- publish-to-npm
filters:
tags:
only: /release/
branches:
ignore: /.*/
- remove-github-release-tag:
requires:
- publish-to-dockerhub-java11-node14
Expand All @@ -1256,16 +1374,19 @@
- publish-to-dockerhub-java17-node18
- publish-to-dockerhub-java17-node20
- publish-to-dockerhub-java17-node22
- publish-to-dockerhub-java17-node24
- publish-to-dockerhub-java19-node14
- publish-to-dockerhub-java19-node16
- publish-to-dockerhub-java19-node18
- publish-to-dockerhub-java21-node16
- publish-to-dockerhub-java21-node18
- publish-to-dockerhub-java21-node20
- publish-to-dockerhub-java21-node22
- publish-to-dockerhub-java21-node24
- publish-to-dockerhub-java23-node18
- publish-to-dockerhub-java23-node20
- publish-to-dockerhub-java23-node22
- publish-to-dockerhub-java23-node24
filters:
tags:
only: /release/
Expand Down
2 changes: 1 addition & 1 deletion scripts/common_image
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export NODE_MAJOR_VERSION="$(echo ${NODE_VERSION_TEMPLATE}|awk -F. '{printf "%d"
echo "Java major version: ${JAVA_MAJOR_VERSION}, Node major version: ${NODE_MAJOR_VERSION}"

if ([ "$JAVA_MAJOR_VERSION" -ne "11" ] && [ "$JAVA_MAJOR_VERSION" -ne "17" ] && [ "$JAVA_MAJOR_VERSION" -ne "19" ] && [ "$JAVA_MAJOR_VERSION" -ne "21" ] && [ "$JAVA_MAJOR_VERSION" -ne "23" ]) || \
([ "$NODE_MAJOR_VERSION" -ne "14" ] && [ "$NODE_MAJOR_VERSION" -ne "16" ] && [ "$NODE_MAJOR_VERSION" -ne "18" ] && [ "$NODE_MAJOR_VERSION" -ne "20" ] && [ "$NODE_MAJOR_VERSION" -ne "22" ])
([ "$NODE_MAJOR_VERSION" -ne "14" ] && [ "$NODE_MAJOR_VERSION" -ne "16" ] && [ "$NODE_MAJOR_VERSION" -ne "18" ] && [ "$NODE_MAJOR_VERSION" -ne "20" ] && [ "$NODE_MAJOR_VERSION" -ne "22" ] && [ "$NODE_MAJOR_VERSION" -ne "24" ])
then
echo "Java: ${JAVA_MAJOR_VERSION}, Node: ${NODE_MAJOR_VERSION} combination is not supported!"
exit -1
Expand Down