Skip to content

Update deployment files #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guaaaaa merged 1 commit into from
Mar 1, 2026
Merged

Update deployment files #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ jobs:
GITHUB_SHA_SHORT=$(echo ${{ github.sha }} | cut -c1-7)
echo "GITHUB_SHA_SHORT=${GITHUB_SHA_SHORT}" >> $GITHUB_ENV
echo "::set-output name=GITHUB_SHA_SHORT::${GITHUB_SHA_SHORT}"
- name: Set lowercase image name
run: echo "IMAGE_NAME_LOWER=$(echo '${{ env.IMAGE_NAME }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
- name: Build image
run: docker compose -f deployment/docker-compose.ci.yml build
- name: Docker login
Expand All @@ -49,6 +51,8 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set lowercase image name
run: echo "IMAGE_NAME_LOWER=$(echo '${{ env.IMAGE_NAME }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
- name: Set up Python 3.9
uses: actions/setup-python@v1
with:
Expand Down Expand Up @@ -139,6 +143,6 @@ jobs:
# TODO: It would be better to use docker-compose against the django service,
# but there is currently a bug in docker-compose preventing running services
# over an SSH host.
IMAGE=${REGISTRY}/${IMAGE_NAME}/django:${GITHUB_SHA_SHORT}
IMAGE=${REGISTRY}/${IMAGE_NAME_LOWER}/django:${GITHUB_SHA_SHORT}
docker run --rm --env-file .env ${IMAGE} python manage.py migrate
echo "Deployment complete"
4 changes: 1 addition & 3 deletions deployment/docker-compose.ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
version: "3.8"

services:
django:
build:
context: ..
dockerfile: ./deployment/Dockerfile
image: ${REGISTRY}/${IMAGE_NAME}/django:${GITHUB_SHA_SHORT}
image: ${REGISTRY}/${IMAGE_NAME_LOWER}/django:${GITHUB_SHA_SHORT}
4 changes: 1 addition & 3 deletions deployment/docker-compose.prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
version: "3.8"

services:
django:
image: ${REGISTRY}/${IMAGE_NAME}/django:${GITHUB_SHA_SHORT}
image: ${REGISTRY}/${IMAGE_NAME_LOWER}/django:${GITHUB_SHA_SHORT}
command: gunicorn hackathon_site.wsgi:application --bind 0.0.0.0:8000 --workers 5 --capture-output --access-logfile - --error-logfile -
ports:
- "8000:8000"
Expand Down
Loading