Compare commits
10 Commits
7f7dc6343e
...
v0.1.0
Author | SHA1 | Date | |
---|---|---|---|
d1951eedb4
|
|||
29f2aa14f3 | |||
99a6f8f1b9 | |||
2084eb0ac2 | |||
071b5b212f | |||
73696a9647 | |||
862da875bd | |||
b4dc8cf707 | |||
8e8cb5c33e
|
|||
4d60b89b02
|
@ -1,13 +1,13 @@
|
|||||||
certifi==2025.4.26
|
certifi==2025.6.15
|
||||||
charset-normalizer==3.4.2
|
charset-normalizer==3.4.2
|
||||||
click==8.1.8
|
click==8.2.1
|
||||||
Flask==3.1.0
|
Flask==3.1.1
|
||||||
Flask-WTF==1.2.2
|
Flask-WTF==1.2.2
|
||||||
idna==3.10
|
idna==3.10
|
||||||
itsdangerous==2.2.0
|
itsdangerous==2.2.0
|
||||||
Jinja2==3.1.6
|
Jinja2==3.1.6
|
||||||
MarkupSafe==3.0.2
|
MarkupSafe==3.0.2
|
||||||
requests==2.32.3
|
requests==2.32.4
|
||||||
urllib3==2.4.0
|
urllib3==2.5.0
|
||||||
Werkzeug==3.1.3
|
Werkzeug==3.1.3
|
||||||
WTForms==3.2.1
|
WTForms==3.2.1
|
@ -1,18 +1,18 @@
|
|||||||
name: Build Docker
|
# name: Build Docker
|
||||||
on:
|
# on:
|
||||||
release:
|
# release:
|
||||||
types:
|
# types:
|
||||||
- published
|
# - published
|
||||||
|
|
||||||
jobs:
|
# jobs:
|
||||||
create_docker:
|
# create_docker:
|
||||||
name: Create Docker Image
|
# name: Create Docker Image
|
||||||
uses: https://git.tainton.uk/actions/gha-workflows/.gitea/workflows/build-push-docker.yml@main
|
# uses: https://git.tainton.uk/actions/gha-workflows/.gitea/workflows/build-push-docker.yml@main
|
||||||
with:
|
# with:
|
||||||
release: ${{ gitea.event.release.name }}
|
# release: ${{ gitea.event.release.name }}
|
||||||
registry: ${{ vars.PACKAGES_REGISTRY_URL }}
|
# registry: ${{ vars.PACKAGES_REGISTRY_URL }}
|
||||||
actions_username: ${{ vars.ACTIONS_USERNAME }}
|
# actions_username: ${{ vars.ACTIONS_USERNAME }}
|
||||||
ghcr_username: ${{ vars.GHCR_USERNAME }}
|
# ghcr_username: ${{ vars.GHCR_USERNAME }}
|
||||||
secrets:
|
# secrets:
|
||||||
ACTIONS_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
|
# ACTIONS_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
|
||||||
GHCR_TOKEN: ${{ secrets.GHCR_TOKEN }}
|
# GHCR_TOKEN: ${{ secrets.GHCR_TOKEN }}
|
||||||
|
@ -2,29 +2,101 @@ name: Release
|
|||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
schedule:
|
schedule:
|
||||||
- cron: "0 9 * * 0"
|
- cron: '0 9 * * 0'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
# test:
|
||||||
name: Test
|
# name: Test
|
||||||
uses: https://git.tainton.uk/repos/roboluke/.gitea/workflows/ci.yml@main
|
# uses: https://git.tainton.uk/${{ gitea.repository }}/.gitea/workflows/ci.yml@main
|
||||||
with:
|
|
||||||
python-version: 3.13
|
tag:
|
||||||
secrets:
|
name: Tag release
|
||||||
SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST_URL }}
|
uses: https://git.tainton.uk/actions/gha-workflows/.gitea/workflows/release-with-tag.yaml@main
|
||||||
SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
|
|
||||||
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
|
|
||||||
|
|
||||||
create_release:
|
create_release:
|
||||||
name: Create Release
|
name: Create Release
|
||||||
needs: test
|
needs: tag
|
||||||
uses: https://git.tainton.uk/actions/gha-workflows/.gitea/workflows/create-release.yml@main
|
uses: https://git.tainton.uk/actions/gha-workflows/.gitea/workflows/create-release-preexisting-tag.yaml@main
|
||||||
|
with:
|
||||||
|
tag: ${{ needs.tag.outputs.tag_name }}
|
||||||
|
body: ${{ needs.tag.outputs.changelog }}
|
||||||
secrets:
|
secrets:
|
||||||
ACTIONS_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
|
ACTIONS_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
|
||||||
|
|
||||||
print_release:
|
create_docker:
|
||||||
name: Print Release
|
name: Publish Docker Images
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: create_release
|
needs: [tag, create_release]
|
||||||
steps:
|
steps:
|
||||||
- run: echo "Created release ${{ needs.create_release.outputs.release_name }}."
|
- name: Update Docker configuration
|
||||||
|
continue-on-error: true
|
||||||
|
run: |
|
||||||
|
mkdir -p /etc/default
|
||||||
|
mkdir -p /etc/docker
|
||||||
|
touch -a /etc/default/docker
|
||||||
|
touch -a /etc/docker/daemon.json
|
||||||
|
echo "DOCKER_OPTS=\"--insecure-registry ${{ vars.PACKAGES_REGISTRY_URL }}\"" >> /etc/default/docker
|
||||||
|
echo "{\"insecure-registries\": [\"${{ vars.PACKAGES_REGISTRY_URL }}\"]}" > /etc/docker/daemon.json
|
||||||
|
|
||||||
|
- name: Get repo name
|
||||||
|
id: split
|
||||||
|
run: echo "repo=${REPO##*/}" >> "$GITEA_OUTPUT"
|
||||||
|
env:
|
||||||
|
REPO: ${{ gitea.repository }}
|
||||||
|
|
||||||
|
- name: Check out repository
|
||||||
|
uses: actions/checkout@v4.2.2
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
ref: ${{ needs.tag.outputs.tag_name }}
|
||||||
|
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
|
- name: Log in to Gitea Container Registry
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
registry: ${{ vars.PACKAGES_REGISTRY_URL }}
|
||||||
|
username: ${{ vars.ACTIONS_USERNAME }}
|
||||||
|
password: ${{ secrets.ACTIONS_TOKEN }}
|
||||||
|
|
||||||
|
- name: Log in to GitHub Container Registry
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
registry: ghcr.io
|
||||||
|
username: ${{ vars.GHCR_USERNAME }}
|
||||||
|
password: ${{ secrets.GHCR_TOKEN }}
|
||||||
|
|
||||||
|
- name: Extract metadata (tags, labels) for Docker
|
||||||
|
id: meta
|
||||||
|
uses: docker/metadata-action@v5
|
||||||
|
with:
|
||||||
|
tags: type=semver,pattern=v{{version}},value=${{ needs.tag.outputs.tag_name }}
|
||||||
|
images: |
|
||||||
|
ghcr.io/${{ vars.GHCR_USERNAME }}/${{ steps.split.outputs.repo }}
|
||||||
|
${{ vars.PACKAGES_REGISTRY_URL }}/${{ gitea.repository }}
|
||||||
|
|
||||||
|
- name: Print metadata
|
||||||
|
run: |
|
||||||
|
printf "Annotations:\n${{ steps.meta.outputs.annotations }}"
|
||||||
|
echo ""
|
||||||
|
printf "Labels:\n${{ steps.meta.outputs.labels }}"
|
||||||
|
echo ""
|
||||||
|
printf "Tags:\n${{ steps.meta.outputs.tags }}"
|
||||||
|
|
||||||
|
- name: Build images
|
||||||
|
uses: docker/build-push-action@v6
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
push: false
|
||||||
|
load: true
|
||||||
|
annotations: ${{ steps.meta.outputs.annotations }}
|
||||||
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
|
|
||||||
|
- name: Push images
|
||||||
|
run: |
|
||||||
|
strtags="${{ steps.meta.outputs.tags }}"
|
||||||
|
readarray -t lines <<<"$strtags"
|
||||||
|
for element in "${lines[@]}"; do docker push "$element"; done
|
||||||
|
unset strtags lines
|
||||||
|
26
Dockerfile
Normal file
26
Dockerfile
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
FROM python:3.13-slim
|
||||||
|
LABEL maintainer="Luke Tainton <luke@tainton.uk>"
|
||||||
|
USER root
|
||||||
|
|
||||||
|
ENV PYTHONPATH="/run:/usr/local/lib/python3.11/lib-dynload:/usr/local/lib/python3.11/site-packages:/usr/local/lib/python3.11"
|
||||||
|
ENV UV_PROJECT_ENVIRONMENT="/usr/local/"
|
||||||
|
|
||||||
|
WORKDIR /run
|
||||||
|
|
||||||
|
RUN mkdir -p /.local && \
|
||||||
|
chmod -R 777 /.local && \
|
||||||
|
pip install -U pip uv==0.5.14
|
||||||
|
|
||||||
|
COPY pyproject.toml /run/pyproject.toml
|
||||||
|
COPY uv.lock /run/uv.lock
|
||||||
|
# needed for PDM build
|
||||||
|
COPY README.md /run/README.md
|
||||||
|
|
||||||
|
RUN uv sync --frozen
|
||||||
|
|
||||||
|
ENTRYPOINT ["python3", "-B", "-m", "app.main"]
|
||||||
|
|
||||||
|
ARG version="dev"
|
||||||
|
ENV APP_VERSION=$version
|
||||||
|
|
||||||
|
COPY app /run/app
|
20
app/app.py
20
app/app.py
@ -4,24 +4,26 @@
|
|||||||
|
|
||||||
from flask import Flask, render_template, request
|
from flask import Flask, render_template, request
|
||||||
from flask_wtf.csrf import CSRFProtect
|
from flask_wtf.csrf import CSRFProtect
|
||||||
from app.send_page import send_page
|
|
||||||
|
|
||||||
|
from app.send_page import send_page
|
||||||
|
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
csrf = CSRFProtect(app)
|
csrf = CSRFProtect(app)
|
||||||
|
|
||||||
@app.route("/", methods=['GET'])
|
|
||||||
|
@app.route("/", methods=["GET"])
|
||||||
def index():
|
def index():
|
||||||
"""Returns index template."""
|
"""Returns index template."""
|
||||||
return render_template('index.html', status='')
|
return render_template("index.html", status="")
|
||||||
|
|
||||||
@app.route("/", methods=['POST'])
|
|
||||||
|
@app.route("/", methods=["POST"])
|
||||||
def send():
|
def send():
|
||||||
"""POST function"""
|
"""POST function"""
|
||||||
result = send_page(
|
result = send_page(
|
||||||
name=request.form.get('name'),
|
name=request.form.get("name"),
|
||||||
email=request.form.get('email'),
|
email=request.form.get("email"),
|
||||||
message=request.form.get('message')
|
message=request.form.get("message"),
|
||||||
)
|
)
|
||||||
status = 'success' if result[0] else 'fail'
|
status = "success" if result[0] else "fail"
|
||||||
return render_template('index.html', status=status)
|
return render_template("index.html", status=status)
|
||||||
|
@ -3,33 +3,31 @@
|
|||||||
"""Send messages via the Pushover API."""
|
"""Send messages via the Pushover API."""
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
|
|
||||||
def send_page(name: str, email: str, message: str) -> tuple:
|
def send_page(name: str, email: str, message: str) -> tuple:
|
||||||
"""POST to the Pushover API."""
|
"""POST to the Pushover API."""
|
||||||
api_url = "https://api.pushover.net/1/messages.json"
|
api_url = "https://api.pushover.net/1/messages.json"
|
||||||
api_token = os.getenv('PUSHOVER_API_TOKEN')
|
api_token = os.getenv("PUSHOVER_API_TOKEN")
|
||||||
user_key = os.getenv('PUSHOVER_USER_KEY')
|
user_key = os.getenv("PUSHOVER_USER_KEY")
|
||||||
|
|
||||||
full_msg = f"Name: {name}\nEmail: {email}\n\nMessage: {message}"
|
full_msg = f"Name: {name}\nEmail: {email}\n\nMessage: {message}"
|
||||||
|
|
||||||
payload = {
|
payload = {
|
||||||
'token': api_token,
|
"token": api_token,
|
||||||
'user': user_key,
|
"user": user_key,
|
||||||
'title': f"ePage from {name}",
|
"title": f"ePage from {name}",
|
||||||
'message': full_msg,
|
"message": full_msg,
|
||||||
'priority': "1",
|
"priority": "1",
|
||||||
'sound': 'cosmic'
|
"sound": "cosmic",
|
||||||
}
|
}
|
||||||
|
|
||||||
req = requests.post(
|
req = requests.post(
|
||||||
api_url,
|
api_url, json=payload, headers={"Content-Type": "application/json"}, timeout=5
|
||||||
json=payload,
|
|
||||||
headers={'Content-Type': 'application/json'},
|
|
||||||
timeout=5
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if req.status_code == 200 and req.json().get('status') == 1:
|
if req.status_code == 200 and req.json().get("status") == 1:
|
||||||
return (True, None)
|
return (True, None)
|
||||||
return (False, req.json())
|
return (False, req.json())
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
"""PyTest unit tests."""
|
"""PyTest unit tests."""
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from app.app import app, csrf
|
from app.app import app, csrf
|
||||||
|
@ -3,10 +3,10 @@
|
|||||||
"""Tests for app/app.py"""
|
"""Tests for app/app.py"""
|
||||||
|
|
||||||
|
|
||||||
from tests import client # pragma: no cover
|
from tests import client # pragma: no cover
|
||||||
|
|
||||||
|
|
||||||
def test_index(client) -> None:
|
def test_index(client) -> None:
|
||||||
"""Ensure that the index page is loaded correctly."""
|
"""Ensure that the index page is loaded correctly."""
|
||||||
req = client.get('/')
|
req = client.get("/")
|
||||||
assert req.status_code == 200 and "ePage" in req.text
|
assert req.status_code == 200 and "ePage" in req.text
|
||||||
|
@ -7,9 +7,5 @@ from app.send_page import send_page
|
|||||||
|
|
||||||
def test_send_page_no_env() -> None:
|
def test_send_page_no_env() -> None:
|
||||||
"""Ensure the API returns an error if no API key specified."""
|
"""Ensure the API returns an error if no API key specified."""
|
||||||
result = send_page(
|
result = send_page(name="Unit Test", email="none@none.com", message="Unit Test")
|
||||||
name='Unit Test',
|
assert not result[0] and result[1].get("token") == "invalid"
|
||||||
email='none@none.com',
|
|
||||||
message='Unit Test'
|
|
||||||
)
|
|
||||||
assert not result[0] and result[1].get('token') == 'invalid'
|
|
||||||
|
Reference in New Issue
Block a user