You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tooling.apache.org by sb...@apache.org on 2025/02/21 12:25:33 UTC
(tooling-atr-experiments) branch main updated: Add version to footer and update the plan
This is an automated email from the ASF dual-hosted git repository.
sbp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tooling-atr-experiments.git
The following commit(s) were added to refs/heads/main by this push:
new 17dcc96 Add version to footer and update the plan
17dcc96 is described below
commit 17dcc9617110b253349492f04933313c0df984ab
Author: Sean B. Palmer <se...@miscoranda.com>
AuthorDate: Fri Feb 21 14:25:21 2025 +0200
Add version to footer and update the plan
---
Dockerfile.alpine | 3 +++
Dockerfile.ubuntu | 3 +++
Makefile | 8 +++++++-
atr/templates/includes/footer.html | 15 +++++++++------
docs/plan.md | 16 ++++++++++------
5 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 762e5e8..bdf7bcf 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -4,6 +4,8 @@ ARG BIND=127.0.0.1:8080
ENV BIND=${BIND}
ARG SCRIPTS=scripts/poetry
ENV SCRIPTS=${SCRIPTS}
+ARG VERSION=unknown
+ENV VERSION=${VERSION}
# gcompat is required for ruff to work
# nodejs is required for pyright to work
@@ -21,6 +23,7 @@ ENV PYTHONUNBUFFERED=1
RUN pip3 install setuptools wheel pip-tools poetry
WORKDIR /opt/atr
COPY . /opt/atr
+RUN sed -i "s%ATR-VERSION%${VERSION}%" atr/templates/includes/footer.html
RUN rm -rf .venv-*
RUN make sync PYTHON="$(which python3)"
RUN make certs
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 8399f24..081a180 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -5,6 +5,8 @@ ARG BIND=127.0.0.1:8080
ENV BIND=${BIND}
ARG SCRIPTS=scripts/poetry
ENV SCRIPTS=${SCRIPTS}
+ARG VERSION=unknown
+ENV VERSION=${VERSION}
RUN apt-get update && apt-get install -y \
git \
@@ -21,6 +23,7 @@ RUN rm -rf /usr/local && python3.13 -m venv /usr/local
RUN pip3 install setuptools wheel pip-tools poetry uv
WORKDIR /opt/atr
COPY . /opt/atr
+RUN sed -i "s%ATR-VERSION%${VERSION}%" atr/templates/includes/footer.html
RUN rm -rf .venv-*
RUN make sync PYTHON="$(find /usr/bin -name python3.13 | head -n 1)"
RUN make certs
diff --git a/Makefile b/Makefile
index db00a7c..348d4ed 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: build certs check docs report serve sync
+.PHONY: build build-alpine-ubuntu certs check docs report run serve sync sync-dev
BIND ?= 127.0.0.1:8080
MANAGER ?= poetry
@@ -6,6 +6,9 @@ PYTHON ?= $(which python3)
SCRIPTS ?= scripts/$(MANAGER)
build:
+ sudo docker build -t tooling-atr-experiments --build-arg BIND=0.0.0.0:443 --build-arg VERSION="$(git log -1 --date=format:'%Y-%m-%d %H:%M' --pretty=format:'<a href=\"https://github.com/apache/tooling-atr-experiments/commit/%H\">%cd %h</a>')" -f Dockerfile.alpine .
+
+build-alpine-ubuntu:
$(SCRIPTS)/build
certs:
@@ -24,6 +27,9 @@ docs:
report:
@echo SCRIPTS = $(SCRIPTS)
+run:
+ sudo docker run --rm -d -v "$HOME/tooling-atr-experiments/state:/opt/atr/state" --network host tooling-atr-experiments
+
serve:
$(SCRIPTS)/run hypercorn --bind $(BIND) --keyfile key.pem --certfile cert.pem atr.server:app --debug --reload
diff --git a/atr/templates/includes/footer.html b/atr/templates/includes/footer.html
index e39063a..33a9c33 100644
--- a/atr/templates/includes/footer.html
+++ b/atr/templates/includes/footer.html
@@ -1,8 +1,11 @@
<footer class="footer mt-auto py-3">
<p class="text-muted">
- Copyright © 2025, The Apache Software Foundation. Material licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, version 2.0</a>.
- </p>
- <p class="text-muted">
- For inquiries, contact <a href="mailto:dev@tooling.apache.org">dev@tooling.apache.org</a>
- </p>
-</footer>
+ Copyright © 2025, The Apache Software Foundation. Material licensed under the
+ <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, version
+ 2.0</a>.
+ </p>
+ <p class="text-muted">
+ This is ATR version <code id="atr-version">ATR-VERSION</code>. For inquiries,
+ contact <a href="mailto:dev@tooling.apache.org">dev@tooling.apache.org</a>
+ </p>
+ </footer>
diff --git a/docs/plan.md b/docs/plan.md
index 9f84781..c0801fb 100644
--- a/docs/plan.md
+++ b/docs/plan.md
@@ -25,8 +25,8 @@ This is a rough plan of immediate tasks. The priority of these tasks may change,
3. Improve key management interface
- [DONE] Display which PMCs are using each key
- [DONE] Add key expiration warnings
- - Fix reported problem with adding keys
- - Add debugging output error messages for when key addition fails
+ - [DONE] Fix reported problem with adding keys
+ - [DONE] Add debugging output error messages for when key addition fails
- Allow adding keys from a KEYS file
4. Release status dashboard
@@ -63,12 +63,15 @@ Advanced tasks, possibly deferred
## Site improvements
-1. Ensure that performance is optimal and debugging is easy
+1. Fix bugs and improve workflow
+ - Add ATR commit or version number to the UI
+ - Ensure that all errors are caught and logged or displayed
+
+2. Ensure that performance is optimal
- Add page load timing metrics to a log
- Add a basic metrics dashboard
- - Ensure that all errors are caught and logged or displayed
-2. Increase the linting and type checking
+3. Increase the linting and type checking
- Potentially add blockbuster
## Basic RC validation
@@ -76,7 +79,8 @@ Advanced tasks, possibly deferred
These tasks are dependent on the task scheduler above.
1. Basic artifact validation
- - Implement basic structure validation (archives, signatures)
+ - Implement basic archive verification
+ - Implement basic signature verification
2. License compliance
- Verify LICENSE and NOTICE files exist and are placed correctly
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tooling.apache.org
For additional commands, e-mail: commits-help@tooling.apache.org