From 462cacad5a64d0d4fc31eab0f3cb0d2a7bc8f642 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Fri, 11 Sep 2020 20:46:17 -0600 Subject: [PATCH] Try to fix blackfriday import --- Dockerfile.moth-devel | 23 ----------------------- README.md | 5 ----- go.mod | 1 + go.sum | 2 ++ pkg/transpile/puzzle.go | 2 +- 5 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 Dockerfile.moth-devel diff --git a/Dockerfile.moth-devel b/Dockerfile.moth-devel deleted file mode 100644 index c1ca075..0000000 --- a/Dockerfile.moth-devel +++ /dev/null @@ -1,23 +0,0 @@ -FROM python:3.7.2-alpine3.8 - -RUN apk --no-cache add \ - freetype-dev \ - gcc \ - musl-dev \ - jpeg-dev \ - zlib-dev \ - && \ - pip3 install \ - scapy==2.4.2 \ - pillow==5.4.1 \ - PyYAML==5.1.1 - - -COPY devel /app/ -COPY example-puzzles /puzzles/ -COPY theme /theme/ -COPY LICENSE.md /LICENSE -COPY VERSION /VERSION - -ENTRYPOINT [ "python3", "/app/devel-server.py" ] -CMD [ "--bind", "0.0.0.0:8080", "--puzzles", "/puzzles", "--theme", "/theme" ] diff --git a/README.md b/README.md index 3676ca5..4c4f991 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,9 @@ Dirtbags Monarch Of The Hill Server ===================== -Master: ![](https://github.com/dirtbags/moth/workflows/Mothd%20Docker%20build/badge.svg?branch=master) ![](https://github.com/dirtbags/moth/workflows/moth-devel%20Docker%20build/badge.svg?branch=master) -Devel: -![](https://github.com/dirtbags/moth/workflows/Mothd%20Docker%20build/badge.svg?branch=devel) -![](https://github.com/dirtbags/moth/workflows/moth-devel%20Docker%20build/badge.svg?branch=devel) - Monarch Of The Hill (MOTH) is a puzzle server. We (the authors) have used it for instructional and contest events called "Tracer FIRE", diff --git a/go.mod b/go.mod index 30167b3..e1cd8c7 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ require ( github.com/namsral/flag v1.7.4-pre // indirect github.com/pkg/sftp v1.11.0 // indirect github.com/russross/blackfriday v2.0.0+incompatible + github.com/russross/blackfriday/v2 v2.0.1 github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/afero v1.3.4 golang.org/x/tools v0.0.0-20200817190302-118ac038d721 // indirect diff --git a/go.sum b/go.sum index dc5134c..b0185b3 100644 --- a/go.sum +++ b/go.sum @@ -15,6 +15,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/russross/blackfriday v2.0.0+incompatible h1:cBXrhZNUf9C+La9/YpS+UHpUT8YD6Td9ZMSU9APFcsk= github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= diff --git a/pkg/transpile/puzzle.go b/pkg/transpile/puzzle.go index 3b228ea..8feb56d 100644 --- a/pkg/transpile/puzzle.go +++ b/pkg/transpile/puzzle.go @@ -17,7 +17,7 @@ import ( "strings" "time" - "github.com/russross/blackfriday" + "github.com/russross/blackfriday/v2" "github.com/spf13/afero" "gopkg.in/yaml.v2" )