Merge pull request #12 from linked-planet/deployment-fixes

Deployment fixes

Author: weickmanna

.github/workflows/ktorbase-example.yml

@@ -6,6 +6,8 @@ on:
       - master
   schedule:
     - cron: "0 1 * * *"
+  release:
+    types: [ published ]
 
 jobs:
 
@@ -66,15 +68,15 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
           AWS_REGISTRY_URL: ${{ secrets.AWS_REGISTRY_URL }}
-        run: ./pipelines/docker-build-push-aws.sh latest
+        run: ./pipelines/docker-build-push-aws.sh latest ${GITHUB_SHA}
 
       - name: Deploy CloudFormation
         working-directory: /tmp/com.linked-planet.ktor-example
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
-        run: ./pipelines/deploy.sh test latest && ./pipelines/deploy-wait.sh test latest
+        run: ./pipelines/deploy.sh test ${GITHUB_SHA} && ./pipelines/deploy-wait.sh test ${GITHUB_SHA}
 
       - name: Run Integration Tests
         working-directory: /tmp/com.linked-planet.ktor-example

.github/workflows/ktorbase.yml

@@ -34,6 +34,13 @@ jobs:
       - name: Gradle Build
         run: ./gradlew build
 
+      - name: Extract Version
+        id: extract-version
+        run: |
+          VERSION="$(./gradlew cV | grep "Project version" | cut -d ":" -f2 | xargs)"
+          echo "Detected version: $VERSION"
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 
@@ -50,8 +57,11 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
-          push: true
-          tags: linkedplanet/ktorbase:latest
+          load: true
+          push: ${{ github.event_name == 'release' }}
+          tags: |
+            linkedplanet/ktorbase:latest
+            linkedplanet/ktorbase:${{ env.VERSION }}
 
       - name: Start KtorBase
         run: docker run -d -p 9090:9090 -e APPLICATION_SECRET=0000000000000000000000000000000 linkedplanet/ktorbase:latest

build.gradle.kts

@@ -7,10 +7,9 @@ plugins {
     // derive gradle version from git tag
     id("pl.allegro.tech.build.axion-release") version "1.14.3"
 
-    // provide & configure tasks: dependencyUpdates, useLatestVersions
+    // provide & configure dependencyUpdates
     id("com.github.ben-manes.versions") version "0.44.0"
     id("se.ascp.gradle.gradle-versions-filter") version "0.1.16"
-    id("se.patrikerdes.use-latest-versions") version "0.2.18"
 }
 
 group = "com.linked-planet"

runConfigurations/ktorbase [dependencyUpdates].run.xml renamed to runConfigurations/dependencyUpdates.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ktorbase [dependencyUpdates]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+  <configuration default="false" name="dependencyUpdates" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -20,4 +20,4 @@
     <DebugAllEnabled>false</DebugAllEnabled>
     <method v="2" />
   </configuration>
-</component>
+</component>