Update Docker build and push workflow and Dockerfile

.dockerignore

@@ -1 +1,2 @@
 venv
+.env

.github/workflows/build-deploy.yml

@@ -0,0 +1,54 @@
+name: Docker Build and Push
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - v*
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - name: Setup Chrome
+        uses: nanasess/setup-chromedriver@v2
+      - name: Install dependencies
+        run: python -m pip install -r requirements.txt
+      - name: Test build
+        run: python manage.py test
+
+  build-and-push:
+    runs-on: ubuntu-latest
+    needs: test
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Build & push Docker image
+        uses: mr-smithers-excellent/docker-build-push@v6
+        with:
+          image: c4thebomb/csmb-housewars
+          registry: docker.io
+          addLatest: true
+          multiPlatform: true
+          platform: linux/amd64,linux/arm64/v8
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+  draft:
+    runs-on: ubuntu-latest
+    needs: test
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Draft release
+        uses: release-drafter/release-drafter@v5
+        id: release-draft
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build-docker.yml

@@ -1,40 +0,0 @@
-name: Commit docker image
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  build:
-    environment: production
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Cache Docker layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          builder: ${{ steps.buildx.outputs.name }}
-          push: true
-          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/collegiate-housewars:latest
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/draft-release.yml

@@ -1,17 +0,0 @@
-name: Create release draft
-
-on:
-  push:
-    branches: [main]
-
-jobs:
-  draft:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Draft release
-        uses: release-drafter/release-drafter@v5
-        id: release-draft
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test-build.yml

@@ -1,24 +0,0 @@
-name: Test build
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.10'
-      - name: Setup Chrome
-        uses: nanasess/setup-chromedriver@v1.0.8
-      - name: Install dependencies
-        run: python -m pip install -r requirements.txt
-      - name: Test build
-        run: python manage.py test

.vscode/settings.json

@@ -5,5 +5,9 @@
     "editor.defaultFormatter": null,
     "[dockercompose]": {
       "editor.defaultFormatter": "ms-azuretools.vscode-docker"
-    }
+    },
+    "lldb.displayFormat": "auto",
+    "lldb.showDisassembly": "auto",
+    "lldb.dereferencePointers": true,
+    "lldb.consoleMode": "commands"
 }

CollegiateHouseWars/settings/__init__.py

@@ -1 +1 @@
-from .dev import *
+from .local import *

CollegiateHouseWars/settings/defaults.py

@@ -1,15 +1,12 @@
 from pathlib import Path
 from django.contrib.messages import constants
 
-# Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent.parent
 
 SECURE_SSL_REDIRECT = False
 SESSION_COOKIE_SECURE = False
 CSRF_COOKIE_SECURE = False
 
-# Application definition
-
 INSTALLED_APPS = [
     'django.contrib.admin',
     'django.contrib.auth',
@@ -21,7 +18,7 @@ INSTALLED_APPS = [
     'smart_selects',
     'formtools',
 
-    'housewars.apps.HousewarsConfig'
+    'housewars',
 ]
 
 MIDDLEWARE = [
@@ -55,9 +52,6 @@ TEMPLATES = [
 
 WSGI_APPLICATION = 'CollegiateHouseWars.wsgi.application'
 
-# Password validation
-# https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators
-
 AUTH_PASSWORD_VALIDATORS = [
     {
         'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
@@ -73,9 +67,6 @@ AUTH_PASSWORD_VALIDATORS = [
     },
 ]
 
-# Internationalization
-# https://docs.djangoproject.com/en/4.0/topics/i18n/
-
 LANGUAGE_CODE = 'en-us'
 
 TIME_ZONE = 'UTC'
@@ -84,9 +75,6 @@ USE_I18N = True
 
 USE_TZ = True
 
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/4.0/howto/static-files/
-
 STATIC_URL = 'static/'
 STATIC_ROOT = BASE_DIR / "staticfiles"
 
@@ -108,9 +96,6 @@ LOGGING = {
     },
 }
 
-# Default primary key field type
-# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
-
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
 

CollegiateHouseWars/settings/dev.py

@@ -1,25 +0,0 @@
-from .defaults import *
-
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/
-
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '*9r50c74r58p#*tnfpadsw*cp&$(^sj585w1u@!y9*eowmwl1*'
-
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
-
-ALLOWED_HOSTS = [
-    'localhost',
-    '127.0.0.1',
-]
-
-# Database
-# https://docs.djangoproject.com/en/4.0/ref/settings/#databases
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': BASE_DIR / 'db.sqlite3',
-    }
-}

CollegiateHouseWars/settings/docker.py

@@ -1,4 +1,4 @@
-from .dev import *
+from .local import *
 
 DATABASES = {
     'default': {

CollegiateHouseWars/settings/local.py

@@ -0,0 +1,17 @@
+from .defaults import *
+
+SECRET_KEY = '*9r50c74r58p#*tnfpadsw*cp&$(^sj585w1u@!y9*eowmwl1*'
+
+DEBUG = True
+
+ALLOWED_HOSTS = [
+    'localhost',
+    '127.0.0.1',
+]
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': BASE_DIR / 'db.sqlite3',
+    }
+}

CollegiateHouseWars/settings/prod.py

@@ -2,29 +2,22 @@ import os
 
 from .defaults import *
 
-# SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = os.environ.get('SECRET_KEY')
 
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = False
 
 ALLOWED_HOSTS = [
-    'housewars.c4thebomb101.com',
-    'csmb-housewars.herokuapp.com',
+    'csmb-housewars.c4patino.com',
 ]
 
 CSRF_TRUSTED_ORIGINS = [
-    'https://housewars.c4thebomb101.com',
-    'https://csmb-housewars.herokuapp.com'
+    'https://csmb-housewars.c4patino.com/'
 ]
 
-# Database
-# https://docs.djangoproject.com/en/4.0/ref/settings/#databases
-
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
-        'NAME': 'housewars',
+        'NAME': os.environ.get('DATABASE_NAME'),
         'USER': os.environ.get('DATABASE_USERNAME'),
         'PASSWORD': os.environ.get('DATABASE_PASSWORD'),
         'HOST': os.environ.get('DATABASE_HOST'),

CollegiateHouseWars/wsgi.py

@@ -12,8 +12,7 @@ import os
 from django.core.wsgi import get_wsgi_application
 from whitenoise import WhiteNoise
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE',
-                      'CollegiateHouseWars.settings.prod')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'CollegiateHouseWars.settings.prod')
 
 application = get_wsgi_application()
 application = WhiteNoise(application)

Dockerfile

@@ -1,9 +1,20 @@
-# syntax=docker/dockerfile:1
-FROM python:3.10.6-slim-buster
-RUN apt update && apt install build-essential default-libmysqlclient-dev -y
+FROM python:3.10
+
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONUNBUFFERED 1
+
 WORKDIR /app
+
 COPY requirements.txt requirements.txt
-RUN python -m pip install -r requirements.txt
+
+RUN pip install --upgrade pip && \
+    pip install -r requirements.txt && \
+    pip install gunicorn
+
 COPY . .
+
+RUN python manage.py collectstatic --noinput
+
 EXPOSE 8000/tcp
-CMD python manage.py runserver 0.0.0.0:8000
+
+CMD ["gunicorn", "--bind", "0.0.0.0:8000", "CollegiateHouseWars.wsgi:application"]

Dockerfile.dev

@@ -0,0 +1,17 @@
+FROM python:3.10
+
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONUNBUFFERED 1
+
+WORKDIR /app
+
+COPY requirements.txt requirements.txt
+
+RUN pip install --upgrade pip && \
+    pip install -r requirements.txt
+
+COPY . .
+
+EXPOSE 8000/tcp
+
+CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]

docker-compose.prod.yml

@@ -0,0 +1,27 @@
+version: '3.8'
+
+services:
+  app:
+    restart: unless-stopped
+    build:
+      context: .
+      dockerfile: Dockerfile
+      platforms:
+        - linux/amd64
+        - linux/arm64/v8
+    image: c4thebomb/csmb-housewars:${TAG:-latest}
+    env_file:
+      - path: .env
+        required: true
+    ports:
+      - 127.0.0.1:8000:8000
+    networks:
+      - housewars
+      - common-network
+    external_links:
+      - mysqldb
+
+networks:
+  common-network:
+    external: true
+  housewars: {}

docker-compose.yml

@@ -5,10 +5,12 @@ services:
     restart: unless-stopped
     build:
       context: .
+      dockerfile: Dockerfile.dev
     ports:
       - 8000:8000
     volumes:
       - ./:/app
+
     networks:
       - housewars
     environment:
@@ -20,11 +22,12 @@ services:
       bash -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000"
   mysqldb:
     restart: unless-stopped
-    image: mysql:5.7
+    image: mysql:8.3
     ports:
       - 3306:3306
     volumes:
       - housewars-mysql:/var/lib/mysql
+
     networks:
       - housewars
     environment:
@@ -34,7 +37,10 @@ services:
       test: [ "CMD", "mysqladmin", "ping", "-h", "localhost" ]
       timeout: 5s
       retries: 10
+
 volumes:
   housewars-mysql:
+
+
 networks:
   housewars: {}

housewars/templates/housewars/activity_form.html

@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block step-counter %}
-    <div class="steps-form">
+<div class="steps-form">
     <div class="steps-row setup-panel">
         <div class="steps-step">
             <button name="wizard_goto_step" class="btn btn-secondary btn-circle" type="submit" value="user">1</button>
@@ -14,11 +14,11 @@
             <p>Activities</p>
         </div>
     </div>
-    </div>
+</div>
 {% endblock %}
 
 {% block content %}
-    <form method="POST">
+<form method="POST">
     {% csrf_token %}
     {{ wizard.management_form }}
 
@@ -32,8 +32,9 @@
     </div>
 
     <div class="form-group d-flex justify-content-center">
-            <button name="wizard_goto_step" class="btn btn-outline-primary btn-50" type="submit" value="{{ wizard.steps.prev }}">Previous Step</button>
+        <button name="wizard_goto_step" class="btn btn-outline-primary btn-50" type="submit"
+            value="{{ wizard.steps.prev }}">Previous Step</button>
         <input id='submit' class="btn btn-outline-primary btn-50" type="submit" value="Submit" />
     </div>
-    </form>
+</form>
 {% endblock %}

housewars/templates/housewars/entry_form.html

@@ -18,7 +18,7 @@
 {% endblock %}
 
 {% block content %}
-    <form method="POST">
+<form method="POST">
     {% csrf_token %}
     {{ wizard.management_form }}
 
@@ -47,5 +47,5 @@
     <div class="form-group d-flex justify-content-center">
         <input id='submit' class="btn btn-outline-primary btn-100" type="submit" value="Submit" />
     </div>
-    </form>
+</form>
 {% endblock %}

templates/admin/base_site.html

@@ -1,10 +1,10 @@
 {% extends "admin/base_site.html" %}
 
 {% block title %}
-    {% if subtitle %}
-        {{ subtitle }} |
-    {% endif %}
-        {{ title }} | House Wars Admin
+{% if subtitle %}
+{{ subtitle }} |
+{% endif %}
+{{ title }} | House Wars Admin
 {% endblock %}
 
 {% block branding %}

templates/base.html

@@ -1,7 +1,8 @@
 {% load static %}
 <!DOCTYPE html>
 <html>
-    <head>
+
+<head>
     <meta charset="ISO-8859-1" />
     <meta name="description" content="A website made by C4 Patino" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -24,8 +25,9 @@
         {% if title %}{{ title }}{% endif %} | House Wars
     </title>
     {% endblock %}
-    </head>
-    <body>
+</head>
+
+<body>
     <main role="main" class="container-fluid h-100 m-0 p-0">
         <div class="row h-100 m-0 p-0">
             <div class="col-lg-4 col-md-12 p-5">
@@ -91,5 +93,6 @@
             </div>
         </div>
     </main>
-    </body>
+</body>
+
 </html>

tests/test_points_entry_create.py

@@ -42,10 +42,6 @@ class PointsEntryCreatePageTest(StaticLiveServerTestCase):
         Select(self.browser.find_element(By.ID, 'id_activity')).select_by_visible_text('Dodgeball - 30 min')
         Select(self.browser.find_element(By.ID, 'house')).select_by_visible_text('Hawk')
 
-        # Wait until the Select button with '1st' shows up
-        WebDriverWait(self.browser, timeout=5).until(visibility_of(
-            self.browser.find_element(By.XPATH, "//option[text()='1st']")))
-
         time.sleep(0.25)
 
         Select(self.browser.find_element(By.ID, 'id_award')).select_by_visible_text('1st')