Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pipeline test #69

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM public.ecr.aws/ubuntu/ubuntu:20.04_stable AS base
ARG TARGETARCH
ARG BUILDARCH

RUN echo "TARGETARCH=${TARGETARCH}\BUILDARCH=${BUILDARCH}"
RUN echo "TARGETARCH=${TARGETARCH}\nBUILDARCH=${BUILDARCH}"

RUN [ ${TARGETARCH} = ${BUILDARCH} ] || { echo "Error: the target architecture is not the same as the build architecture"; exit 1; }

Expand Down
4 changes: 2 additions & 2 deletions src/docker_assets/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var Default = Config{
Strikethrough: true,
Linkify: true,
TaskList: true,
Plantuml: true,
Plantuml: true,
},
Renderer: Renderer{
Unsafe: false,
Expand Down Expand Up @@ -95,4 +95,4 @@ type ParserAttribute struct {
Title bool
// Enables custom attributeds for blocks.
Block bool
}
}
5 changes: 2 additions & 3 deletions src/docker_assets/convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (

"github.com/spf13/afero"

uml "github.com/OhYee/goldmark-plantuml"
"github.com/gohugoio/hugo/hugofs"
"github.com/gohugoio/hugo/markup/converter"
"github.com/gohugoio/hugo/markup/highlight"
Expand All @@ -42,7 +43,6 @@ import (
"github.com/yuin/goldmark/renderer/html"
"github.com/yuin/goldmark/text"
"github.com/yuin/goldmark/util"
uml "github.com/OhYee/goldmark-plantuml"
)

// Provider is the package entry point.
Expand Down Expand Up @@ -153,7 +153,6 @@ func newMarkdown(pcfg converter.ProviderConfig) goldmark.Markdown {
extensions = append(extensions, uml.Default)
}


md := goldmark.New(
goldmark.WithExtensions(
extensions...,
Expand Down Expand Up @@ -361,4 +360,4 @@ func newHighlighting(cfg highlight.Config) goldmark.Extender {
w.WriteString("</div>")
}),
)
}
}
2 changes: 1 addition & 1 deletion src/make_hugo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ HELP_USAGE
function build_docker_image {
if ! [[ $(docker images -q $IMAGE_NAME) ]]; then
echo "********** Building container image for Hugo and dependencies"
docker buildx -t $IMAGE_NAME --build-arg GOPROXY=$(go env GOPROXY) .
docker build -t $IMAGE_NAME --build-arg GOPROXY=$(go env GOPROXY) .
fi
}

Expand Down
Loading