Skip to content

Commit 889c2f1

Browse files
committed
Adjusting script
1 parent 89f52a2 commit 889c2f1

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ jobs:
2727
run: ./extract_staticfiles.sh ${GITHUB_REF##*/}
2828

2929
- name: Push staticfiles to S3
30-
run: AWS_DEFAULT_REGION=eu-west-1 AWS_ACCESS_KEY_ID=${{secrets.AWS_ACCESS_KEY}} AWS_SECRET_ACCESS_KEY=${{secrets.AWS_SECRET_ACCESS_KEY}} aws s3 cp --recursive --acl public-read static s3://codeinstitute-webpublic/hackathon_staticfiles/${GITHUB_REF##*/}
30+
run: AWS_DEFAULT_REGION=eu-west-1 AWS_ACCESS_KEY_ID=${{secrets.AWS_ACCESS_KEY}} AWS_SECRET_ACCESS_KEY=${{secrets.AWS_SECRET_ACCESS_KEY}} aws s3 cp --recursive --acl public-read staticfiles s3://codeinstitute-webpublic/hackathon_staticfiles/${GITHUB_REF##*/}

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ COPY ./templates/ /hackathon-app/templates/
2525
COPY ./hackadmin/ /hackathon-app/hackadmin/
2626
COPY ./manage.py /hackathon-app/manage.py
2727

28+
RUN python3 manage.py collectstatic
29+
2830
EXPOSE 8000
2931
ENTRYPOINT ["gunicorn", "--workers=5", "--timeout=120", "--access-logfile=-",\
3032
"--bind=0.0.0.0:8000", "--max-requests=1000", "main.wsgi:application"]

extract_staticfiles.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#!/bin/bash
22

3-
rm -fr static
3+
rm -fr staticfiles
44

55
container_id=$(docker create 949266541515.dkr.ecr.eu-west-1.amazonaws.com/ci-hackathon-app:$1)
6-
docker exec -it $container_id python3 manage.py collectstatic
7-
docker cp $container_id:/staticfiles ./static
6+
docker cp $container_id:/hackathon-app/static ./staticfiles
87
docker rm -v $container_id
98

0 commit comments

Comments
 (0)