Skip to content
This repository has been archived by the owner on Mar 10, 2024. It is now read-only.

remove staging dockerfile, add configureation steps to workflows #89

Merged
merged 1 commit into from
Sep 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .github/workflows/build-gcp-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,16 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Configure Dev image
if: ${{ inputs.environment == 'development' }}
run: |
cp config/.env.staging .env

- name: Configure Prod image
if: ${{ inputs.environment == 'production' }}
run: |
cp config/.env.production .env

- name: Docker meta
uses: docker/metadata-action@v4
id: meta
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/build-ghcr-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ name: 'Build Image for GitHub Container Registry'

on:
workflow_call:
inputs:
environment:
description: 'The environment to deploy to ("production", "development")'
required: true
type: string
default: 'production'

jobs:
build_docker_image:
Expand All @@ -13,6 +19,16 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Configure Dev image
if: ${{ inputs.environment == 'development' }}
run: |
cp config/.env.staging .env

- name: Configure Prod image
if: ${{ inputs.environment == 'production' }}
run: |
cp config/.env.production .env

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
name: Build Image for Development
uses: ./.github/workflows/build-gcp-image.yaml
with:
environment: development
environment: 'development'
secrets: inherit


Expand All @@ -32,7 +32,7 @@ jobs:
uses: ./.github/workflows/cloud-run-deploy.yaml
needs: build_gcp_image
with:
environment: development
environment: 'development'
version: ${{ needs.build_gcp_image.outputs.version }}
service: client-dev
service: 'client-dev'
secrets: inherit
10 changes: 6 additions & 4 deletions .github/workflows/deploy-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
contents: read
uses: ./.github/workflows/build-gcp-image.yaml
with:
environment: production
environment: 'production'
secrets: inherit

deploy_to_cloud_run:
Expand All @@ -28,12 +28,14 @@ jobs:
uses: ./.github/workflows/cloud-run-deploy.yaml
needs: build_gcp_image
with:
environment: production
environment: 'production'
version: ${{ needs.build_gcp_image.outputs.version }}
service: client
service: 'client'
secrets: inherit

build_ghcr_image:
name: Build Image for GHCR
uses: ./.github/workflows/build-ghcr-image.yaml
secrets: inherit
secrets: inherit
with:
environment: 'production'
17 changes: 0 additions & 17 deletions Dockerfile.staging

This file was deleted.

File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion src/features/Resume/Resume.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ const fabStyle = {
* @constructor
*/
export function Resume() {
// ToDo - Add a way to download PDF resume
useTitle("Resume");
return (
<Box p={2}>
Expand Down