From 671f91e8043cb2b448396d37440398ae5007c5a9 Mon Sep 17 00:00:00 2001 From: parkseongheum Date: Sat, 25 Feb 2023 15:04:08 +0900 Subject: [PATCH 1/5] =?UTF-8?q?update:=20staticfile=20=EC=88=98=EC=A7=91?= =?UTF-8?q?=20=EC=9E=90=EB=8F=99=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy_on_dev.yml | 2 +- .github/workflows/deploy_on_prod.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy_on_dev.yml b/.github/workflows/deploy_on_dev.yml index 41ca0fb..4c24c54 100644 --- a/.github/workflows/deploy_on_dev.yml +++ b/.github/workflows/deploy_on_dev.yml @@ -94,4 +94,4 @@ 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" diff --git a/.github/workflows/deploy_on_prod.yml b/.github/workflows/deploy_on_prod.yml index e2e66ab..b07b575 100644 --- a/.github/workflows/deploy_on_prod.yml +++ b/.github/workflows/deploy_on_prod.yml @@ -93,4 +93,4 @@ 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" From 33c4e866648c7e2bb3d0cf27e413599063f71ade Mon Sep 17 00:00:00 2001 From: parkseongheum Date: Sat, 25 Feb 2023 15:16:20 +0900 Subject: [PATCH 2/5] =?UTF-8?q?update:=20staticfile=20=EC=88=98=EC=A7=91?= =?UTF-8?q?=20=EC=9E=90=EB=8F=99=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyconkr/settings-dev.py | 1 + pyconkr/settings-prod.py | 1 + 2 files changed, 2 insertions(+) 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" From 6f2aff454886569ca834b17d163749b1a9bad80a Mon Sep 17 00:00:00 2001 From: parkseongheum Date: Sat, 25 Feb 2023 15:33:57 +0900 Subject: [PATCH 3/5] =?UTF-8?q?update:=20staticfile=20=EC=88=98=EC=A7=91?= =?UTF-8?q?=20=EC=9E=90=EB=8F=99=ED=99=94=20(manage.py)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy_on_dev.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy_on_dev.yml b/.github/workflows/deploy_on_dev.yml index 4c24c54..8f3761e 100644 --- a/.github/workflows/deploy_on_dev.yml +++ b/.github/workflows/deploy_on_dev.yml @@ -94,4 +94,13 @@ jobs: run: | source ./zappa-env/bin/activate zappa update dev2023 - zappa manage dev2023 "collectstatic --no-input" +# 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: | + python manage.py collectstatic --no-input --settings=pyconkr.settings-dev From fa3d041f339d1352edd2d6614e2a5ef9bfb19903 Mon Sep 17 00:00:00 2001 From: parkseongheum Date: Sat, 25 Feb 2023 15:41:17 +0900 Subject: [PATCH 4/5] =?UTF-8?q?update:=20staticfile=20=EC=88=98=EC=A7=91?= =?UTF-8?q?=20=EC=9E=90=EB=8F=99=ED=99=94=20(manage.py)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy_on_dev.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy_on_dev.yml b/.github/workflows/deploy_on_dev.yml index 8f3761e..f459ba9 100644 --- a/.github/workflows/deploy_on_dev.yml +++ b/.github/workflows/deploy_on_dev.yml @@ -103,4 +103,5 @@ jobs: 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 From e176d37cc291b9b2b3aa0f107f0ccdae7b7d0ad3 Mon Sep 17 00:00:00 2001 From: parkseongheum Date: Sat, 25 Feb 2023 15:50:48 +0900 Subject: [PATCH 5/5] =?UTF-8?q?update:=20staticfile=20=EC=88=98=EC=A7=91?= =?UTF-8?q?=20=EC=9E=90=EB=8F=99=ED=99=94=20(manage.py)=20[PROD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy_on_prod.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy_on_prod.yml b/.github/workflows/deploy_on_prod.yml index b07b575..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 prod2023 "collectstatic --no-input" +# 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