Merge pull request #5805 from grom72/docker-product

Docker product
pmem · Jul 18, 2023 · 4111b50 · 4111b50
2 parents a21dac3 + 356737f
commit 4111b50
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/docker_rebuild.yml b/.github/workflows/docker_rebuild.yml
@@ -8,11 +8,14 @@ on:
       - master
     paths:
       - 'utils/docker/images/**'
+      - '.github/workflows/docker_rebuild.yml'
+
   push:
     branches:
       - master
     paths:
       - 'utils/docker/images/**'
+      - '.github/workflows/docker_rebuild.yml'
   schedule:
     # run this job at 22:00 UTC every other day (hopefully just before the nightly)
     - cron:  '0 22 */2 * *'
@@ -47,9 +50,6 @@ jobs:
     steps:
       - name: Clone the git repo
         uses: actions/checkout@v3
-
-      - name: Get system information
-        run: ./$WORKDIR/get-system-info.sh
 
       - name: Pull or rebuild the image
-        run: cd $WORKDIR && ${{ matrix.CONFIG }} ./pull-or-rebuild-image.sh
+        run: cd $WORKDIR && ${{ matrix.CONFIG }} ./pull-or-rebuild-image.sh rebuild
diff --git a/utils/docker/pull-or-rebuild-image.sh b/utils/docker/pull-or-rebuild-image.sh
@@ -61,16 +61,21 @@ function push_image {
 	# - not a pull_request event,
 	# - and PUSH_IMAGE flag was set for current build.
 	if [[ "${CI_REPO_SLUG}" == "${GITHUB_REPO}" \
-		&& (${CI_BRANCH} == stable-* || ${CI_BRANCH} == devel-* || ${CI_BRANCH} == master) \
-		&& ${CI_EVENT_TYPE} != "pull_request" \
-		&& ${PUSH_IMAGE} == "1" ]]
+		&& (((${CI_BRANCH} == stable-* || ${CI_BRANCH} == devel-* || ${CI_BRANCH} == master) \
+		&& ${CI_EVENT_TYPE} != "pull_request") \
+			|| ${PUSH_IMAGE} == "1") ]]
 	then
 		echo "The image will be pushed to the Container Registry: ${DOCKER_REPO}"
 		pushd ${images_dir_name}
 		./push-image.sh
 		popd
 	else
 		echo "Skip pushing the image to the ${DOCKER_REPO}."
+		echo "CI_REPO_SLUG: ${CI_REPO_SLUG}"
+		echo "GITHUB_REPO: ${GITHUB_REPO}"
+		echo "CI_BRANCH: ${CI_BRANCH}"
+		echo "CI_EVENT_TYPE: ${CI_EVENT_TYPE}"
+		echo "PUSH_IMAGE: ${PUSH_IMAGE}"
 	fi
 }
 
@@ -108,7 +113,8 @@ for file in $files; do echo $file; done
 for file in $files; do
 	# Check if modified files are relevant to the current build
 	if [[ $file =~ ^($base_dir)\/Dockerfile\.($OS)-($OS_VER)$ ]] \
-		|| [[ $file =~ ^($base_dir)\/.*\.sh$ ]]
+		|| [[ $file =~ ^($base_dir)\/.*\.sh$ ]] \
+		|| [[ $file =~ ^($base_dir)\/\.\.\/\.\.\/\.\.\/\.github\/workflows\/docker_rebuild\.yml ]]
 	then
 		build_image
 		push_image