From 11f1a190c62dfade78a85d05ad2216cd357c4dbe Mon Sep 17 00:00:00 2001
From: Michel Promonet <michel.promonet@free.fr>
Date: Wed, 11 Sep 2024 16:34:59 +0200
Subject: [PATCH] disable docker push from cirrus

---
 .cirrus.yml                      | 10 +++++-----
 .github/workflows/cpp-docker.yml |  7 +++++++
 CMakeLists.txt                   |  7 +++----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index fe061923..37f2e724 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -17,7 +17,7 @@ linux_docker_builder:
     [ "$TAG" == "master" ] && export TAG=latest
     docker build -t $CIRRUS_REPO_FULL_NAME:${TAG}-amd64 . -f Dockerfile
     docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS 
-    docker push $CIRRUS_REPO_FULL_NAME:${TAG}-amd64
+    #docker push $CIRRUS_REPO_FULL_NAME:${TAG}-amd64
 
 linuxarmv7_docker_builder:    
   timeout_in: 120m
@@ -39,7 +39,7 @@ linuxarmv7_docker_builder:
     [ "$TAG" == "master" ] && export TAG=latest
     docker build -t $CIRRUS_REPO_FULL_NAME:${TAG}-armv7 . -f Dockerfile.rpi --build-arg ARCH=armv7l --build-arg CROSSCOMPILER=https://sourceforge.net/projects/raspberry-pi-cross-compilers/files/Raspberry%20Pi%20GCC%20Cross-Compiler%20Toolchains/Buster/GCC%2010.2.0/Raspberry%20Pi%202%2C%203/cross-gcc-10.2.0-pi_2-3.tar.gz --build-arg IMAGE=balenalib/raspberry-pi2
     docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS 
-    docker push $CIRRUS_REPO_FULL_NAME:${TAG}-armv7
+    #docker push $CIRRUS_REPO_FULL_NAME:${TAG}-armv7
 
 linuxarmv6_docker_builder:    
   timeout_in: 120m
@@ -61,7 +61,7 @@ linuxarmv6_docker_builder:
     [ "$TAG" == "master" ] && export TAG=latest
     docker build -t $CIRRUS_REPO_FULL_NAME:${TAG}-armv6 . -f Dockerfile.rpi
     docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS 
-    docker push $CIRRUS_REPO_FULL_NAME:${TAG}-armv6
+    #docker push $CIRRUS_REPO_FULL_NAME:${TAG}-armv6
 
 linuxarm64_docker_builder:
   env:
@@ -82,7 +82,7 @@ linuxarm64_docker_builder:
     [ "$TAG" == "master" ] && export TAG=latest
     docker build -t $CIRRUS_REPO_FULL_NAME:${TAG}-arm64 . -f Dockerfile.arm64 
     docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
-    docker push $CIRRUS_REPO_FULL_NAME:${TAG}-arm64
+    #docker push $CIRRUS_REPO_FULL_NAME:${TAG}-arm64
 
     
 publish_docker_builder:
@@ -102,4 +102,4 @@ publish_docker_builder:
     docker manifest create --amend $CIRRUS_REPO_FULL_NAME:${TAG} $CIRRUS_REPO_FULL_NAME:${TAG}-amd64 $CIRRUS_REPO_FULL_NAME:${TAG}-armv7 $CIRRUS_REPO_FULL_NAME:${TAG}-armv6 $CIRRUS_REPO_FULL_NAME:${TAG}-arm64
     docker manifest annotate $CIRRUS_REPO_FULL_NAME:${TAG} $CIRRUS_REPO_FULL_NAME:${TAG}-armv7 --os linux --arch arm --variant v7
     docker manifest annotate $CIRRUS_REPO_FULL_NAME:${TAG} $CIRRUS_REPO_FULL_NAME:${TAG}-armv6 --os linux --arch arm --variant v6l
-    docker manifest push $CIRRUS_REPO_FULL_NAME:${TAG} -p
+    #docker manifest push $CIRRUS_REPO_FULL_NAME:${TAG} -p
diff --git a/.github/workflows/cpp-docker.yml b/.github/workflows/cpp-docker.yml
index 6beb7c85..87dc0da6 100644
--- a/.github/workflows/cpp-docker.yml
+++ b/.github/workflows/cpp-docker.yml
@@ -56,6 +56,13 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
+    
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+
     - name: Publish multiarch image
       env:
         DOCKER_CLI_EXPERIMENTAL: enabled
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29523f6d..37bff386 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -279,10 +279,9 @@ endif()
 endif()
 
 #cpack
-install (TARGETS ${CMAKE_PROJECT_NAME} RUNTIME DESTINATION .)
-install (DIRECTORY html DESTINATION .)
-install (FILES config.json DESTINATION .)
-install (FILES Procfile DESTINATION .)
+install (TARGETS ${CMAKE_PROJECT_NAME} RUNTIME DESTINATION ${CMAKE_PROJECT_NAME})
+install (DIRECTORY html DESTINATION ${CMAKE_PROJECT_NAME})
+install (FILES config.json DESTINATION ${CMAKE_PROJECT_NAME})
 SET(CPACK_GENERATOR "TGZ")
 SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_BUILD_TYPE})
 SET(CPACK_PACKAGE_CONTACT "michel.promonet@free.fr")