crossbuild: add 'refresh' to push latest commits into image

FreeRADIUS · Sep 18, 2019 · 63a0da9 · 63a0da9
1 parent 446eb9f
commit 63a0da9
Showing 1 changed file with 25 additions and 15 deletions.
diff --git a/scripts/docker/crossbuild/crossbuild.mk b/scripts/docker/crossbuild/crossbuild.mk
@@ -56,19 +56,20 @@ crossbuild.info:
 
 crossbuild.help: crossbuild.info
 	@echo Make targets:
-	@echo "    crossbuild             - build and test all images"
-	@echo "    crossbuild.common      - build and test common images"
-	@echo "    crossbuild.down        - stop all containers"
-	@echo "    crossbuild.reset       - remove cache of docker state"
-	@echo "    crossbuild.clean       - down and reset all targets"
-	@echo "    crossbuild.wipe        - destroy all crossbuild Docker images"
-	@echo "    crossbuild.IMAGE       - build and test IMAGE"
-	@echo "    crossbuild.IMAGE.log   - show latest build log"
-	@echo "    crossbuild.IMAGE.up    - start container"
-	@echo "    crossbuild.IMAGE.down  - stop container"
-	@echo "    crossbuild.IMAGE.sh    - shell in container"
-	@echo "    crossbuild.IMAGE.clean - stop container and tidy up"
-	@echo "    crossbuild.IMAGE.wipe  - remove Docker image"
+	@echo "    crossbuild               - build and test all images"
+	@echo "    crossbuild.common        - build and test common images"
+	@echo "    crossbuild.down          - stop all containers"
+	@echo "    crossbuild.reset         - remove cache of docker state"
+	@echo "    crossbuild.clean         - down and reset all targets"
+	@echo "    crossbuild.wipe          - destroy all crossbuild Docker images"
+	@echo "    crossbuild.IMAGE         - build and test IMAGE"
+	@echo "    crossbuild.IMAGE.log     - show latest build log"
+	@echo "    crossbuild.IMAGE.up      - start container"
+	@echo "    crossbuild.IMAGE.down    - stop container"
+	@echo "    crossbuild.IMAGE.sh      - shell in container"
+	@echo "    crossbuild.IMAGE.refresh - push latest commits into container"
+	@echo "    crossbuild.IMAGE.clean   - stop container and tidy up"
+	@echo "    crossbuild.IMAGE.wipe    - remove Docker image"
 
 #
 #  Remove stamp files, so that we try and create images again
@@ -124,8 +125,8 @@ crossbuild.${1}.up: $(DD)/stamp-up.${1}
 #
 #  Run tests in the container
 #
-.PHONY: $(DD)/docker.run.${1}
-$(DD)/docker.run.${1}: $(DD)/stamp-up.${1}
+.PHONY: $(DD)/docker.refresh.${1}
+$(DD)/docker.refresh.${1}: $(DD)/stamp-up.${1}
 	${Q}echo "REFRESH ${1}"
 	${Q}docker container exec $(CB_CPREFIX)${1} sh -c 'rsync -a /srv/src/ /srv/local-src/'
 	${Q}docker container exec $(CB_CPREFIX)${1} sh -c 'git config -f /srv/local-src/config core.bare true'
@@ -134,6 +135,9 @@ $(DD)/docker.run.${1}: $(DD)/stamp-up.${1}
 	${Q}docker container exec $(CB_CPREFIX)${1} sh -c '(cd /srv/build && git pull --rebase)'
 	${Q}docker container exec $(CB_CPREFIX)${1} sh -c '[ -e /srv/build/config.log ] || echo CONFIGURE ${1}'
 	${Q}docker container exec $(CB_CPREFIX)${1} sh -c '[ -e /srv/build/config.log ] || (cd /srv/build && ./configure -C)' > $(DD)/configure.${1} 2>&1
+
+.PHONY: $(DD)/docker.run.${1}
+$(DD)/docker.run.${1}: $(DD)/docker.refresh.${1}
 	${Q}echo "TEST ${1} > $(DD)/log.${1}"
 	${Q}docker container exec $(CB_CPREFIX)${1} sh -c '(cd /srv/build && make && make test)' > $(DD)/log.${1} 2>&1 || echo FAIL ${1}
 
@@ -191,6 +195,12 @@ crossbuild.${1}.wipe:
 	${Q}docker image rm $(CB_IPREFIX)/${1} >/dev/null 2>&1 || true
 	${Q}rm -f $(DD)/stamp-image.${1}
 
+#
+#  Refresh git repository within the docker image
+#
+.PHONY: crossbuild.${1}.refresh
+crossbuild.${1}.refresh: $(DD)/docker.refresh.${1}
+
 #
 #  Run the build test
 #