Skip to content

Commit baaa134

Browse files
AndrasZieglerAndrasZiegler
committed
updated names in the docker build setup
1 parent 4c70593 commit baaa134

File tree

3 files changed

+115
-115
lines changed

3 files changed

+115
-115
lines changed

‎.github/build-docker-image.sh

+53-53
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
1-
#!/bin/sh
2-
3-
display_help() {
4-
echo "Usage: $0 -i image_name -v version -r registry -a architecture " >&2
5-
echo
6-
echo " -i image_name Specify the image name, for example: bluetooth-AoA-example-build-env"
7-
echo " -v version Specify the version of docker image, for example: 1.0.0"
8-
echo " -r registry Specify the Docker registry to push the image to (optional) example: lx0017637.silabs.com:5000"
9-
echo " If internal registry is used, SonarQube will be included."
10-
echo " -a architecture Specify the architecture, for example: x86_64 or aarch64"
11-
echo
12-
exit 1
13-
}
14-
15-
image_name=""
16-
version="1.0.0"
17-
registry="none"
18-
architecture="x86_64"
19-
run_sonarqube_scanner="false"
20-
21-
# Process the options
22-
while getopts ":h:i:v:r:a:" opt; do
23-
case $opt in
24-
h) display_help
25-
exit;;
26-
i) image_name="$OPTARG";;
27-
v) version="$OPTARG";;
28-
r) registry="$OPTARG";;
29-
a) architecture="$OPTARG";;
30-
\?) echo "Invalid option -$OPTARG" >&2
31-
display_help
32-
exit 1;;
33-
:) echo "Option -$OPTARG requires an argument." >&2
34-
display_help
35-
exit 1;;
36-
esac
37-
done
38-
39-
if [ "$registry" = "lx0017637.silabs.com:5000" ] ; then
40-
echo "Internal silabs build with: $registry"
41-
run_sonarqube_scanner="true"
42-
fi
43-
44-
# Build the Docker image
45-
echo "Building Docker image: $image_name:$version for architecture: $architecture "
46-
docker build --build-arg ARCH="$architecture" --build-arg SONARQUBE="$run_sonarqube_scanner" -t "$image_name:$version" -f Dockerfile .
47-
48-
if [ -n "$registry" ] && [ "$registry" != "none" ] ; then
49-
docker tag "$image_name:$version" "$registry/$image_name:$version"
50-
docker push "$registry/$image_name:$version"
51-
else
52-
echo "Docker registry not specified, skipping tagging and pushing."
53-
fi
1+
#!/bin/sh
2+
3+
display_help() {
4+
echo "Usage: $0 -i image_name -v version -r registry -a architecture " >&2
5+
echo
6+
echo " -i image_name Specify the image name, for example: bluetooth-aoa-example-build-env"
7+
echo " -v version Specify the version of docker image, for example: 1.0.0"
8+
echo " -r registry Specify the Docker registry to push the image to (optional)"
9+
echo " If internal registry is used, SonarQube will be included."
10+
echo " -a architecture Specify the architecture, for example: x86_64 or aarch64"
11+
echo
12+
exit 1
13+
}
14+
15+
image_name=""
16+
version="1.0.0"
17+
registry="none"
18+
architecture="x86_64"
19+
run_sonarqube_scanner="false"
20+
21+
# Process the options
22+
while getopts ":h:i:v:r:a:" opt; do
23+
case $opt in
24+
h) display_help
25+
exit;;
26+
i) image_name="$OPTARG";;
27+
v) version="$OPTARG";;
28+
r) registry="$OPTARG";;
29+
a) architecture="$OPTARG";;
30+
\?) echo "Invalid option -$OPTARG" >&2
31+
display_help
32+
exit 1;;
33+
:) echo "Option -$OPTARG requires an argument." >&2
34+
display_help
35+
exit 1;;
36+
esac
37+
done
38+
39+
if [ "$registry" = "lx0017637.silabs.com:5000" ] ; then
40+
echo "Internal silabs build with: $registry"
41+
run_sonarqube_scanner="true"
42+
fi
43+
44+
# Build the Docker image
45+
echo "Building Docker image: $image_name:$version for architecture: $architecture "
46+
docker build --build-arg ARCH="$architecture" --build-arg SONARQUBE="$run_sonarqube_scanner" -t "$image_name:$version" -f Dockerfile .
47+
48+
if [ -n "$registry" ] && [ "$registry" != "none" ] ; then
49+
docker tag "$image_name:$version" "$registry/$image_name:$version"
50+
docker push "$registry/$image_name:$version"
51+
else
52+
echo "Docker registry not specified, skipping tagging and pushing."
53+
fi

‎.github/build-with-docker.sh

+61-61
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
1-
#!/bin/sh
2-
3-
display_help() {
4-
echo "Usage: $0 -i image_name -v version -r registry -a architecture -c clean" >&2
5-
echo
6-
echo " -i image_name Specify the image name, for example: bluetooth-AoA-example-build-env"
7-
echo " -v version Specify the version of docker image, for example: 1.0.0"
8-
echo " -r registry Specify the Docker registry to push the image to"
9-
echo " -a architecture Specify the architecture, for example: x86_64 or aarch64 (optional)"
10-
echo " -c clean Specify 'clean' to remove the built Docker image"
11-
echo
12-
exit 1
13-
}
14-
15-
image_name="bluetooth-AoA-example-build-env"
16-
version="1.0.0"
17-
registry="none"
18-
architecture="x86_64"
19-
clean="false"
20-
21-
while getopts ":hi:v:r:a:c" opt; do
22-
case ${opt} in
23-
h )
24-
display_help
25-
exit 1;;
26-
i )
27-
image_name=$OPTARG;;
28-
v )
29-
version=$OPTARG;;
30-
r )
31-
registry=$OPTARG;;
32-
a )
33-
architecture=$OPTARG;;
34-
c )
35-
clean="true";;
36-
\? )
37-
display_help
38-
exit 1 ;;
39-
: )
40-
echo "Invalid option: $OPTARG requires an argument" 1>&2
41-
display_help
42-
exit 1 ;;
43-
esac
44-
done
45-
shift $((OPTIND -1))
46-
47-
echo "<----- Docker based Weber Wasp project building script ----->"
48-
49-
echo "Calling the docker image builder script..."
50-
51-
# Call build-docker-image.sh with arguments
52-
sh ./.github/build-docker-image.sh -i $image_name -v $version -r $registry -a $architecture || { echo "Failed to build the Docker image"; exit 1; }
53-
54-
echo "<----- Running the docker based build environment ----->"
55-
# Run the docker image
56-
docker run -u root --rm -v $(pwd):/home/jenkins/$image_name $image_name:$version /bin/sh -c "cd $image_name && make all"
57-
58-
if [ "$clean" = "true" ]; then
59-
docker rmi $image_name:$version
60-
echo "Clean mode activated. Docker image $image_name:$version is removed."
61-
fi
1+
#!/bin/sh
2+
3+
display_help() {
4+
echo "Usage: $0 -i image_name -v version -r registry -a architecture -c clean" >&2
5+
echo
6+
echo " -i image_name Specify the image name, for example: bluetooth-aoa-example-build-env"
7+
echo " -v version Specify the version of docker image, for example: 1.0.0"
8+
echo " -r registry Specify the Docker registry to push the image to"
9+
echo " -a architecture Specify the architecture, for example: x86_64 or aarch64 (optional)"
10+
echo " -c clean Specify 'clean' to remove the built Docker image"
11+
echo
12+
exit 1
13+
}
14+
15+
image_name="bluetooth-aoa-example-build-env"
16+
version="1.0.0"
17+
registry="none"
18+
architecture="x86_64"
19+
clean="false"
20+
21+
while getopts ":hi:v:r:a:c" opt; do
22+
case ${opt} in
23+
h )
24+
display_help
25+
exit 1;;
26+
i )
27+
image_name=$OPTARG;;
28+
v )
29+
version=$OPTARG;;
30+
r )
31+
registry=$OPTARG;;
32+
a )
33+
architecture=$OPTARG;;
34+
c )
35+
clean="true";;
36+
\? )
37+
display_help
38+
exit 1 ;;
39+
: )
40+
echo "Invalid option: $OPTARG requires an argument" 1>&2
41+
display_help
42+
exit 1 ;;
43+
esac
44+
done
45+
shift $((OPTIND -1))
46+
47+
echo "<----- Docker based Weber Wasp project building script ----->"
48+
49+
echo "Calling the docker image builder script..."
50+
51+
# Call build-docker-image.sh with arguments
52+
sh ./.github/build-docker-image.sh -i $image_name -v $version -r $registry -a $architecture || { echo "Failed to build the Docker image"; exit 1; }
53+
54+
echo "<----- Running the docker based build environment ----->"
55+
# Run the docker image
56+
docker run -u root --rm -v $(pwd):/home/jenkins/$image_name $image_name:$version /bin/sh -c "cd $image_name && make all"
57+
58+
if [ "$clean" = "true" ]; then
59+
docker rmi $image_name:$version
60+
echo "Clean mode activated. Docker image $image_name:$version is removed."
61+
fi

‎.github/workflows/03-SonarQube-Analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
uses: actions/checkout@v4.2.2
1717

1818
- name: Pull a docker image file
19-
run: docker pull lx0017637.silabs.com:5000/bluetooth-AoA-example:1.0.0
19+
run: docker pull lx0017637.silabs.com:5000/bluetooth-aoa-example-build-env:1.0.0
2020

2121
- name: Run SonarQube analysis
2222

0 commit comments

Comments
 (0)