Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions denis/Containerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM alpine:3.20 AS build
FROM alpine:3.24 AS build
RUN apk add \
clang \
gcc \
make \
;

Expand All @@ -17,7 +18,7 @@ RUN mkdir -p /var/lib/email/journal && \
chown -R 100:100 /var/lib/email/journal && \
:

FROM alpine:3.20 AS denis
FROM alpine:3.24 AS denis

RUN apk add \
py3-peewee \
Expand Down
4 changes: 2 additions & 2 deletions extenginx/Containerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.20 AS build
FROM alpine:3.24 AS build

RUN apk update && apk upgrade && apk add \
envsubst \
Expand Down Expand Up @@ -50,7 +50,7 @@ RUN envsubst \
> nginx.conf \
;

FROM alpine:3.20 AS nginx
FROM alpine:3.24 AS nginx

RUN apk update && apk upgrade && apk add \
nginx \
Expand Down
2 changes: 1 addition & 1 deletion git/Containerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.20 as git
FROM alpine:3.24 as git

RUN apk update && apk upgrade && apk add \
python3 \
Expand Down
5 changes: 3 additions & 2 deletions mailman/Containerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
FROM alpine:3.20 AS build
FROM alpine:3.24 AS build
RUN apk add \
clang \
gcc \
make \
;

COPY --from=watcher_source . /watcher

RUN make -C /watcher CC='clang -static'

FROM alpine:3.20 AS mailman
FROM alpine:3.24 AS mailman

RUN apk add \
py3-peewee \
Expand Down
4 changes: 2 additions & 2 deletions orbit/Containerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.20 AS build
FROM alpine:3.24 AS build

RUN apk update && apk upgrade && apk add \
envsubst \
Expand All @@ -14,7 +14,7 @@ RUN test -n "$orbit_version_info" || (echo 'version info is not set' && false) &
rm config.py.template \
;

FROM alpine:3.20 AS orbit
FROM alpine:3.24 AS orbit

RUN apk update && apk upgrade && apk add \
py3-bcrypt \
Expand Down
18 changes: 10 additions & 8 deletions orbit/radius.py
Original file line number Diff line number Diff line change
Expand Up @@ -651,21 +651,20 @@ def handle_dashboard(rocket):

repo = git.Repo('/var/lib/git/grading.git')
grades = {}
human_feedback = {}
for component in ['review1', 'review2', 'final']:
tag = f'{assignment.name}_{component}_{rocket.session.username}'
try:
grades[component] = repo.git.execute(['git', 'notes', '--ref=grade', 'show', tag])
except git.GitCommandError:
grades[component] = None

tag = f'{assignment.name}_final_{rocket.session.username}'
try:
human_feedback = repo.git.execute(['git', 'notes', '--ref=feedback', 'show', tag])
except git.GitCommandError:
human_feedback = '-'
try:
human_feedback[component] = repo.git.execute(['git', 'notes', '--ref=feedback', 'show', tag])
except git.GitCommandError:
human_feedback[component] = '-'

ret += str(AsmtTable(assignment, oopsieness, peer1, peer2, init,
rev1, grades['review1'], rev2, grades['review2'], final, grades['final'], human_feedback))
rev1, grades['review1'], rev2, grades['review2'], final, grades['final'], str(human_feedback)))
return rocket.respond(ret + '</form>', 'Dashboard')


Expand Down Expand Up @@ -810,14 +809,17 @@ def handle_containerfile(rocket):
not (fullname := user.fullname)):
fullname = 'Unknown'
return rocket.raw_respond(HTTPStatus.OK, rf'''
FROM fedora:42
FROM fedora:44

RUN dnf -y update && \
dnf install -y --setopt=install_weak_deps=False --setopt=tsflags= \
git \
tar \
make \
gcc \
clang \
llvm \
lld \
qemu-system-riscv \
qemu-user-static-riscv \
binutils-riscv64-linux-gnu \
Expand Down
3 changes: 2 additions & 1 deletion pop/Containerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM alpine:3.20 AS build
FROM alpine:3.24 AS build
RUN apk add \
clang \
gcc \
make \
;

Expand Down
3 changes: 2 additions & 1 deletion smtp/Containerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM alpine:3.20 AS build
FROM alpine:3.24 AS build
RUN apk add \
clang \
gcc \
make \
;

Expand Down
4 changes: 2 additions & 2 deletions submatrix/Containerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.20 as build
FROM alpine:3.24 as build

RUN apk update && \
apk add \
Expand All @@ -12,7 +12,7 @@ ARG MATRIX_HOSTNAME

RUN envsubst '$MATRIX_HOSTNAME' < /etc/synapse/homeserver.yaml.template > /etc/synapse/homeserver.yaml

FROM alpine:3.20 as submatrix
FROM alpine:3.24 as submatrix

COPY --from=build /etc/synapse/homeserver.yaml /etc/synapse/homeserver.yaml

Expand Down
4 changes: 4 additions & 0 deletions submatrix/homeserver.yaml.template
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,9 @@ trusted_key_servers: []
modules:
- module: orbit_auth.OrbitAuthProvider
config: {}
rc_login:
address:
per_second: 30
burst_count: 30

# vim:ft=yaml
Loading