Skip to content

Commit

Permalink
chore: add base Dockerfile. update infra workflow (#3)
Browse files Browse the repository at this point in the history
  • Loading branch information
ashleyjtaylor authored Mar 9, 2024
1 parent 7b45e11 commit da579c5
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 9 deletions.
16 changes: 9 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,12 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

trigger-deploy:
if: github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
needs: [audit, lint, test, build, sonarcloud]
steps:
- uses: actions/checkout@v4
- run: gh workflow run deploy.yml -f environment=dev
# trigger-deploy:
# if: github.ref == 'refs/heads/main'
# runs-on: ubuntu-latest
# needs: [audit, lint, test, build, sonarcloud]
# steps:
# - uses: actions/checkout@v4
# - run: gh workflow run deploy.yml -f environment=dev
# env:
# GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
32 changes: 32 additions & 0 deletions .github/workflows/infrastructure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: infrastructure
env:
NODE_VERSION: 20
OIDC_ROLE_ARN: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/saas-github-oidc-provider-role
# ECR_URI: ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com

permissions:
id-token: write
Expand Down Expand Up @@ -31,6 +32,13 @@ jobs:
- name: Install
run: npm ci

- uses: dorny/[email protected]
id: filter
with:
filters: |
images:
- '**/*/Dockerfile.base'
- name: Build
working-directory: ./infrastructure
run: |
Expand All @@ -43,6 +51,30 @@ jobs:
role-session-name: gh-infrastructure-deploy-session
role-to-assume: ${{ env.OIDC_ROLE_ARN }}
aws-region: ${{ secrets.AWS_REGION }}

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v2

- name: Deploy base image
if: ${{ steps.filter.outputs.images == 'true' }}
working-directory: ./infrastructure
run: |
# aws --version
# aws ecr get-login-password --region ${{ secrets.AWS_REGION }} | docker login --username AWS --password-stdin ${{ env.ECR_URI }}
# aws ecr describe-repositories --repository-names base || aws ecr create-repository --repository-name base
# REPOSITORY_URI=${{ env.ECR_URI }}/base
# docker build -t $REPOSITORY_URI:latest -f ./images/Dockerfile.base .
# docker tag base:latest $REPOSITORY_URI:latest
# docker push $REPOSITORY_URI:latest
docker build -t $REGISTRY/$REPOSITORY:latest -f ./images/Dockerfile.base .
docker push $REGISTRY/$REPOSITORY:latest
env:
REGISTRY: ${{ steps.login-ecr.outputs.registry }}
REPOSITORY: base

- name: Synth
working-directory: ./infrastructure
Expand Down
4 changes: 2 additions & 2 deletions infrastructure/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "infrastructure",
"version": "0.1.0",
"version": "0.0.1",
"bin": {
"infrastructure": "bin/infrastructure.js"
},
Expand All @@ -16,4 +16,4 @@
"constructs": "^10.0.0",
"source-map-support": "^0.5.21"
}
}
}
5 changes: 5 additions & 0 deletions infrastructure/src/images/Dockerfile.base
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM node:20-alpine3.19 AS setup
RUN apk add --no-cache python3 make g++
RUN apk add --no-cache jq
RUN apk add --no-cache git
RUN apk add --no-cache aws-cli

0 comments on commit da579c5

Please sign in to comment.