diff options
| -rw-r--r-- | Dockerfile | 15 | ||||
| -rw-r--r-- | mulkcms.lisp | 7 | ||||
| -rw-r--r-- | renovate.json | 3 | ||||
| -rw-r--r-- | templates/article.html | 2 |
4 files changed, 13 insertions, 14 deletions
@@ -2,11 +2,15 @@ ### STAGE 0 ### ############### -FROM mcreations/sbcl:1.4.1 +FROM mcreations/sbcl:2.1.1 RUN sbcl --eval "\ - (progn \ - (ql:quickload \"deploy\")) \ + (progn \ + (ql-dist:install-dist \ + \"http://beta.quicklisp.org/dist/quicklisp/2022-07-08/distinfo.txt\" \ + :replace t \ + :prompt nil) \ + (ql:quickload \"deploy\")) \ " COPY . /opt/quicklisp/local-projects/mulkcms @@ -20,6 +24,8 @@ USER root RUN mkdir -p /opt/quicklisp/local-projects/mulkcms/bin RUN chown lisp /opt/quicklisp/local-projects/mulkcms/bin +RUN apt-get update && apt-get install -y libssl1.0 && rm -rf /var/lib/apt/lists/* && apt-get clean + RUN sbcl --eval "\ (progn \ (asdf:make \"mulkcms-ht\")) \ @@ -30,11 +36,10 @@ RUN sbcl --eval "\ ### STAGE 1 ### ############### -FROM debian:9-slim +FROM debian:11-slim RUN apt-get update && apt-get install -y libssl1.0 && rm -rf /var/lib/apt/lists/* && apt-get clean - COPY --from=0 /opt/quicklisp/local-projects/mulkcms/bin /mulkcms/bin COPY static-files /mulkcms/static-files COPY templates /mulkcms/templates diff --git a/mulkcms.lisp b/mulkcms.lisp index 0e53c2d..e7f8819 100644 --- a/mulkcms.lisp +++ b/mulkcms.lisp @@ -264,8 +264,6 @@ (:journal-index "/journal") (:full-journal-index "/journal?full") (:view-atom-feed (values "/feed")) - (:view-comment-feed (cond (article-id (values "/~A?comment-feed" article-base)) - (t "/comment-feed"))) (:view (cond (comment-id (values "/~A#comment-~D" article-base comment-id)) (article-id (values "/~A" article-base)) (t "/"))) @@ -395,10 +393,6 @@ :absolute t))) :edit-link (link-to :edit :article-id article) :edit-button-label "Edit" - :comment-feed (link-to :view-comment-feed - :article-id article - :absolute t) - :comment-feed-label "Comment feed" :comments-label (case comment-num (0 "no comments") (1 "1 comment") @@ -1295,7 +1289,6 @@ path params (cond ((assoc "edit" params :test #'equal) :edit) - ((assoc "comment-feed" params :test #'equal) :view-comment-feed) ((assoc "atom" params :test #'equal) :view-atom-entry) (t :view))) (find-transaction-key-handler path)))) diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..09e3ef5 --- /dev/null +++ b/renovate.json @@ -0,0 +1,3 @@ +{ "$schema": "https://docs.renovatebot.com/renovate-schema.json" +, "extends": ["local>mulk/renovate-config"] +} diff --git a/templates/article.html b/templates/article.html index cde94fc..d5ac4d2 100644 --- a/templates/article.html +++ b/templates/article.html @@ -33,8 +33,6 @@ </div> </form> | - <a href="{comment-feed|html-attr-value}">{comment-feed-label|html}</a> - | <a href="{comments-link|html-attr-value}">{comments-label|html}</a> </footer> </div> |