diff --git a/.github/workflows/deploy_on_dev.yml b/.github/workflows/deploy_on_dev.yml index 41ca0fb..f459ba9 100644 --- a/.github/workflows/deploy_on_dev.yml +++ b/.github/workflows/deploy_on_dev.yml @@ -94,4 +94,14 @@ jobs: run: | source ./zappa-env/bin/activate zappa update dev2023 -# zappa manage dev collectstatic \ No newline at end of file +# zappa manage dev2023 "collectstatic --no-input" + + - name: Collect Static Files to S3 + env: + AWS_ACCESS_KEY_ID: ${{ secrets.PYCON_DEV_2023_AWS_KEY }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.PYCON_DEV_2023_AWS_SECRET }} + AWS_S3_ACCESS_KEY_ID: ${{ secrets.PYCON_DEV_2023_AWS_KEY }} + AWS_S3_SECRET_ACCESS_KEY: ${{ secrets.PYCON_DEV_2023_AWS_SECRET }} + run: | + source ./zappa-env/bin/activate + python manage.py collectstatic --no-input --settings=pyconkr.settings-dev diff --git a/.github/workflows/deploy_on_prod.yml b/.github/workflows/deploy_on_prod.yml index e2e66ab..94fa814 100644 --- a/.github/workflows/deploy_on_prod.yml +++ b/.github/workflows/deploy_on_prod.yml @@ -93,4 +93,14 @@ jobs: run: | source ./zappa-env/bin/activate zappa update prod2023 -# zappa manage production collectstatic \ No newline at end of file +# zappa manage prod2023 "collectstatic --no-input" + + - name: Collect Static Files to S3 + env: + AWS_ACCESS_KEY_ID: ${{ secrets.PYCON_DEV_2023_AWS_KEY }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.PYCON_DEV_2023_AWS_SECRET }} + AWS_S3_ACCESS_KEY_ID: ${{ secrets.PYCON_DEV_2023_AWS_KEY }} + AWS_S3_SECRET_ACCESS_KEY: ${{ secrets.PYCON_DEV_2023_AWS_SECRET }} + run: | + source ./zappa-env/bin/activate + python manage.py collectstatic --no-input --settings=pyconkr.settings-prod \ No newline at end of file diff --git a/pyconkr/settings-dev.py b/pyconkr/settings-dev.py index 3b712de..2c47248 100644 --- a/pyconkr/settings-dev.py +++ b/pyconkr/settings-dev.py @@ -26,4 +26,5 @@ STATICFILES_STORAGE = "storages.backends.s3boto3.S3StaticStorage" AWS_S3_ACCESS_KEY_ID = os.getenv("AWS_S3_ACCESS_KEY_ID") AWS_S3_SECRET_ACCESS_KEY = os.getenv("AWS_S3_SECRET_ACCESS_KEY") +AWS_DEFAULT_REGION = "ap-northeast-2" AWS_STORAGE_BUCKET_NAME = "pyconkr-api-v2-static-dev" diff --git a/pyconkr/settings-prod.py b/pyconkr/settings-prod.py index 9655b74..a624dd9 100644 --- a/pyconkr/settings-prod.py +++ b/pyconkr/settings-prod.py @@ -26,4 +26,5 @@ STATICFILES_STORAGE = "storages.backends.s3boto3.S3StaticStorage" AWS_S3_ACCESS_KEY_ID = os.getenv("AWS_S3_ACCESS_KEY_ID") AWS_S3_SECRET_ACCESS_KEY = os.getenv("AWS_S3_SECRET_ACCESS_KEY") +AWS_DEFAULT_REGION = "ap-northeast-2" AWS_STORAGE_BUCKET_NAME = "pyconkr-api-v2-static"