Skip to content

Commit 076bf29

Browse files
authored
Fix multi (#797)
* fix(docker): Multi does not launch a second Jenkins controller anymore. * fix(docker): The single quotes prevent $JENKINS_CONTROLLER from being expanded. * fix(docker): Improve the fallback mechanism implementation. * fix(docker): Adding error handling for when both controllers are unreachable. And making the timeout duration configurable. * fix(ga): Follows the official documentation for the action https://github.com/docker/login-action?tab=readme-ov-file#github-container-registry * fix(docker): Wait for 60s before switching to another server. * fix(ga): Remove trailing spaces.
1 parent a75cc24 commit 076bf29

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ updates:
4747
directory: "./dockerfiles/agent-discovery"
4848
schedule:
4949
interval: weekly
50-
open-pull-requests-limit: 10
50+
open-pull-requests-limit: 10
5151
- package-ecosystem: docker
5252
directory: "./dockerfiles/android"
5353
schedule:

.github/workflows/github-docker-registry-push.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ jobs:
9191
uses: docker/login-action@v3
9292
with:
9393
registry: ghcr.io
94-
username: ${{ env.GHCR_USERNAME }}
95-
password: ${{ env.GHCR_TOKEN }}
94+
username: ${{ github.actor }}
95+
password: ${{ secrets.GITHUB_TOKEN }}
9696

9797
- name: Extract branch name
9898
# This step extracts the branch name

dockerfiles/agent-discovery/find-name.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,16 @@ while true; do
7979
sleep 2 # Wait for 5 seconds before the next iteration of the loop.
8080
done
8181

82-
# Check if jenkins_controller is reachable, otherwise fall back to multi_jenkins_controller
82+
## Check if jenkins_controller is reachable, otherwise fall back to multi_jenkins_controller
8383
JENKINS_CONTROLLER="jenkins_controller"
84-
if ! curl -s -f "http://${JENKINS_CONTROLLER}:8080/login" > /dev/null; then
84+
if ! curl -s -f --max-time 60 "http://${JENKINS_CONTROLLER}:8080/login" > /dev/null; then
8585
echo "Primary controller not reachable, falling back to multi controller..."
86-
JENKINS_CONTROLLER="multi_jenkins_controller"
87-
if ! curl -s -f "http://${JENKINS_CONTROLLER}:8080/login" > /dev/null; then
88-
echo "Error: Neither primary nor multi controller is reachable"
89-
exit 1
86+
JENKINS_CONTROLLER="multi_jenkins_controller"
87+
if ! curl -s -f --max-time 60 "http://${JENKINS_CONTROLLER}:8080/login" > /dev/null; then
88+
echo "Error: Neither primary nor multi controller is reachable"
89+
exit 1
9090
fi
91-
fi
91+
fi
9292

9393
# Check If Jenkins is running or not
9494
# If the message is found, awk exits with a non-zero status (1), and the loop continues.

0 commit comments

Comments
 (0)