recreate with bot signing (#336)

* recreate with bot signing

* pass key

.github/workflows/main.yml

@@ -72,10 +72,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

Makefile

@@ -8,7 +8,7 @@ build-kubernetes:
 	docker build -f _infra/docker/Dockerfile .
 
 lint:
-	pipenv check ./application ./tests -i 51457
+	pipenv check ./application ./tests -i 70612 -i 70624
 	pipenv run isort .
 	pipenv run black --line-length 120 .
 	pipenv run flake8 ./application ./tests

README.md

@@ -40,7 +40,7 @@ pipenv run tox
 To run the service with the required dependencies:
 
 ```bash
-docker-compose up -d db 
+docker compose up -d db 
 pipenv run python run.py
 ```
 
@@ -57,7 +57,7 @@ The database will automatically be created when starting the application.
 To run the service in a Docker container a Compose script is included:
 
 ```bash
-docker-compose up -d
+docker compose up -d
 ```
 
 ## Configuration

_infra/helm/collection-instrument/Chart.yaml

@@ -14,9 +14,9 @@ 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: 3.0.32
+version: 3.0.33
 
 # 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: 3.0.32
+appVersion: 3.0.33
 

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '2'
-
 services:
   db:
     container_name: postgres_collection_instrument

tox.ini

@@ -5,7 +5,7 @@ envlist = py311
 passenv=HOME
 allowlist_externals=flake8
                     black
-                    docker-compose
+                    docker
                     isort
                     py.test
 setenv=APP_SETTINGS=TestingConfig
@@ -14,9 +14,9 @@ commands=
     black --line-length 120 --check .
     isort . --check-only
     flake8 .
-    docker-compose up -d db
+    docker compose up -d db
     py.test --cov=application --cov-report html --cov-report term-missing []
-    docker-compose down
+    docker compose down
 
 [flake8]
 max-line-length = 120