build and use paketo image

communitiesuk · May 21, 2024 · 71e0697 · 71e0697
1 parent 37829ce
commit 71e0697
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 15 deletions.
diff --git a/.github/workflows/pullpreview.yml b/.github/workflows/pullpreview.yml
@@ -4,6 +4,24 @@ on:
     types: [labeled, unlabeled, synchronize, closed, reopened]
 
 jobs:
+  tag_version:
+    runs-on: ubuntu-latest
+    outputs:
+      version_to_tag: ${{ steps.tagging.outputs.tag_value }}
+    steps:
+      - id: tagging
+        run: |
+          echo "tag_value=$(echo '${{ github.ref }}' | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_OUTPUT
+  paketo_build:
+    permissions:
+      packages: write
+    needs: [ tag_version ]
+    uses: communitiesuk/funding-service-design-workflows/.github/workflows/package.yml@main
+    with:
+      assets_required: true
+      version_to_build: ${{ needs.tag_version.outputs.version_to_tag }}
+      owner: ${{ github.repository_owner }}
+      application: funding-service-design-post-award-submit
   deploy:
     permissions:
       contents: read # to fetch code (actions/checkout)
@@ -16,11 +34,14 @@ jobs:
     timeout-minutes: 30
     environment: ${{ inputs.environment || 'dev' }}
     steps:
-    - name: configure aws credentials
-      uses: aws-actions/configure-aws-credentials@v2
-      with:
-        role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_NUMBER }}:role/GithubCopilotDeploy
-        role-session-name: POST_AWARD_DATA_STORE_PULLPREVIEW
-        aws-region: eu-west-2
-    - uses: actions/checkout@v2
-    - uses: pullpreview/action@v5.6.1
+      - name: Inject branch image into docker compose file
+        run: |
+         yq -i '.services.submit.image =  "ghcr.io/communitiesuk/${{ github.event.repository.name }}:${{ github.ref_name == 'main' && 'latest' || needs.tag_version.outputs.version_to_tag }}"' docker-compose.yml
+      - name: Deploy preview environment
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_NUMBER }}:role/GithubCopilotDeploy
+          role-session-name: POST_AWARD_DATA_STORE_PULLPREVIEW
+          aws-region: eu-west-2
+      - uses: actions/checkout@v2
+      - uses: pullpreview/action@v5.6.1
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,11 +1,7 @@
 services:
   submit:
     # https://github.com/communitiesuk/funding-service-design-post-award-data-store
-    build:
-      args:
-        REQUIREMENTS: requirements-dev.txt
-    command: bash -c "flask run -p 8080 -h 0.0.0.0"
-    volumes: [ '.:/app' ]
+    image:  # Value injected by github actions
     ports:
       - 80:8080
     environment:
@@ -31,8 +27,8 @@ services:
   localstack:
     image: localstack/localstack
     ports:
-      - "127.0.0.1:4566:4566"            # LocalStack Gateway
-      - "127.0.0.1:4510-4559:4510-4559"  # external services port range
+      - "127.0.0.1:4566:4566" # LocalStack Gateway
+      - "127.0.0.1:4510-4559:4510-4559" # external services port range
     environment:
       - DEBUG=${DEBUG-}
       - DOCKER_HOST=unix:///var/run/docker.sock