Skip to content

Commit

Permalink
Update build, hugo and nginx. (#99)
Browse files Browse the repository at this point in the history
* Update license to 2024

* docker: Use nginx 1.26 (latest stable)

* build: Update GitHub actions.

* build: Update to hugo 0.134.0

- Add a trailing slash to baseURL as expected by the new hugo version.
- Use the newer css.Sass instead of deprecated resources.ToCSS
  • Loading branch information
jholdstock authored Sep 5, 2024
1 parent bd5d304 commit 76afc90
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- name: Build
run: docker build -t decred/dcrbounty:$(date +%s) .
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Build image
FROM alpine:3.18
FROM alpine:latest

ARG HUGO_BASEURL
ENV HUGO_BASEURL ${HUGO_BASEURL:-https://bounty.decred.org}
ENV HUGO_VERSION 0.117.0
ENV HUGO_BASEURL ${HUGO_BASEURL:-https://bounty.decred.org/}
ENV HUGO_VERSION 0.134.0

LABEL description="gohugo build"
LABEL version="1.0"
Expand All @@ -23,7 +23,7 @@ COPY ./ /root/
RUN bin/build-hugo.sh

# Serve image (stable nginx version)
FROM nginx:1.24-alpine
FROM nginx:1.26-alpine

LABEL description="dcrbounty server"
LABEL version="1.0"
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ISC License

Copyright (c) 2018-2023 The Decred developers
Copyright (c) 2018-2024 The Decred developers

Permission to use, copy, modify, and distribute this software for any
purpose with or without fee is hereby granted, provided that the above
Expand Down
2 changes: 1 addition & 1 deletion bin/watch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ hugo server \
--buildDrafts \
--disableFastRender \
--source src \
--baseURL http://localhost:1313
--baseURL http://localhost:1313/

2 changes: 1 addition & 1 deletion src/layouts/partials/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</div>

{{ $options := (dict "targetPath" "optinal-style.css" "outputStyle" "compressed" "enableSourceMap" true) }}
{{ $style := resources.Get "scss/optional/main.scss" | resources.ToCSS $options | resources.Fingerprint }}
{{ $style := resources.Get "scss/optional/main.scss" | css.Sass $options | resources.Fingerprint }}
<link rel="stylesheet" href="{{ $style.Permalink }}">

</body>
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/partials/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{{ end }}

{{ $options := (dict "targetPath" "style.css" "outputStyle" "compressed" "enableSourceMap" true) }}
{{ $style := resources.Get "scss/critical/main.scss" | resources.ToCSS $options | resources.Fingerprint }}
{{ $style := resources.Get "scss/critical/main.scss" | css.Sass $options | resources.Fingerprint }}
<link rel="stylesheet" href="{{ $style.Permalink }}">

{{ $favicon := resources.Get "img/favicon.ico" }}
Expand Down

0 comments on commit 76afc90

Please sign in to comment.