RAS-1238 Update to docker compose from docker-compose (#293)

* updating docker compose with gpg sign * Update Chart.yaml Checking BOT version bump and signing * auto patch increment * Avoid rebuild if BOT bumps Chart.yaml * Update Chart.yaml Testing paths-ignore so BOT version bump doesn't retrigger build * auto patch increment * Try glob pattern for paths-ignore * auto patch increment * Try a different glob pattern * auto patch increment --------- Co-authored-by: Mark Price <[email protected]> Co-authored-by: ras-rm-pr-bot <[email protected]> Co-authored-by: Mark Price <[email protected]>
ONSdigital · Aug 14, 2024 · 4c8823b · 4c8823b
1 parent 703af57
commit 4c8823b
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 20 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -9,6 +9,8 @@ on:
   pull_request:
     branches:
       - main
+    paths-ignore:
+      - '**/Chart.yaml'
 
 env:
   IMAGE: case
@@ -84,10 +86,28 @@ jobs:
         run: |
           git fetch --tags
           echo "tag=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
+      - name: Import BOT GPG key
+        run: echo $BOT_GPG_KEY | base64 --decode | gpg --batch --import
+        env:
+          BOT_GPG_KEY: ${{ secrets.BOT_GPG_KEY }}
+      - name: Prepare gpg CLI signing step
+        run: |
+          rm -rf /tmp/gpg.sh
+          echo '#!/bin/bash' >> /tmp/gpg.sh
+          echo 'gpg --batch --pinentry-mode=loopback --passphrase $BOT_GPG_KEY_PASSPHRASE $@' >> /tmp/gpg.sh
+          chmod +x /tmp/gpg.sh
+      - name: Setup git
+        run: |
+          git config commit.gpgsign true
+          git config user.signingkey "${{ secrets.BOT_GPG_KEY_ID }}"
+          git config gpg.program /tmp/gpg.sh
+          git config user.name "${{ secrets.BOT_USERNAME }}"
+          git config user.email "${{ secrets.BOT_EMAIL }}"
       - name: update versions
         if: github.ref != 'refs/heads/main'
         env:
           GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
+          BOT_GPG_KEY_PASSPHRASE: ${{ secrets.BOT_GPG_KEY_PASSPHRASE }}
           COMMIT_MSG: |
             auto patch increment
         shell: bash

diff --git a/_infra/helm/case/Chart.yaml b/_infra/helm/case/Chart.yaml
@@ -14,9 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 12.0.22
+version: 12.0.23
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 12.0.22
-
+appVersion: 12.0.23
diff --git a/docker-compose-down.sh b/docker-compose-down.sh
@@ -0,0 +1 @@
+docker compose down
diff --git a/docker-compose-up.sh b/docker-compose-up.sh
@@ -0,0 +1 @@
+docker compose up -d
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2.1'
 services:
   collectionexercise:
     container_name: collex-case-it

diff --git a/pom.xml b/pom.xml
@@ -216,12 +216,6 @@
             <version>${godaddylogging.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.dkanejs.maven.plugins</groupId>
-            <artifactId>docker-compose-maven-plugin</artifactId>
-            <version>4.0.0</version>
-        </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
@@ -322,6 +316,13 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/org.codehaus.mojo/exec-maven-plugin -->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <version>3.4.0</version>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -330,39 +331,40 @@
 
         <plugins>
             <plugin>
-                <groupId>com.dkanejs.maven.plugins</groupId>
-                <artifactId>docker-compose-maven-plugin</artifactId>
-                <version>4.0.0</version>
+                <artifactId>exec-maven-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
                 <executions>
                     <execution>
                         <id>pre-stop</id>
                         <phase>pre-integration-test</phase>
                         <goals>
-                            <goal>down</goal>
+                            <goal>exec</goal>
                         </goals>
                         <configuration>
-                            <composeFile>${project.basedir}/docker-compose.yml</composeFile>
+                            <workingDirectory>${project.basedir}</workingDirectory>
+                            <executable>docker-compose-down.sh</executable>
                         </configuration>
                     </execution>
                     <execution>
                         <id>up</id>
                         <phase>pre-integration-test</phase>
                         <goals>
-                            <goal>up</goal>
+                            <goal>exec</goal>
                         </goals>
                         <configuration>
-                            <composeFile>${project.basedir}/docker-compose.yml</composeFile>
-                            <detachedMode>true</detachedMode>
+                            <workingDirectory>${project.basedir}</workingDirectory>
+                            <executable>docker-compose-up.sh</executable>
                         </configuration>
                     </execution>
                     <execution>
                         <id>down</id>
                         <phase>post-integration-test</phase>
                         <goals>
-                            <goal>down</goal>
+                            <goal>exec</goal>
                         </goals>
                         <configuration>
-                            <composeFile>${project.basedir}/docker-compose.yml</composeFile>
+                            <workingDirectory>${project.basedir}</workingDirectory>
+                            <executable>docker-compose-down.sh</executable>
                         </configuration>
                     </execution>
                 </executions>