diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 6388888..c4bc974 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -5,6 +5,6 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 - name: Build the Docker image run: docker build -t decred/dcrdevdocs:$(date +%s) . diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 0724a0e..922e4c2 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -6,12 +6,12 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.11] + python-version: [3.14] steps: - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 + uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0 with: python-version: ${{ matrix.python-version }} - name: Install dependencies diff --git a/Dockerfile b/Dockerfile index e9da928..164cd87 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ # Build image -FROM python:3.11 +FROM python:3.14 LABEL description="dcrdevdocs build" LABEL version="1.0" -LABEL maintainer "jholdstock@decred.org" +LABEL maintainer="jholdstock@decred.org" USER root WORKDIR /root @@ -17,20 +17,20 @@ RUN pip install mkdocs && \ # Install dependencies for generating social cards. # https://squidfunk.github.io/mkdocs-material/setup/setting-up-social-cards -RUN apt update && \ - apt install -y libcairo2-dev libfreetype6-dev libffi-dev libjpeg-dev libpng-dev libz-dev && \ +RUN apt-get update && \ + apt-get install -y libcairo2-dev libfreetype6-dev libffi-dev libjpeg-dev libpng-dev libz-dev && \ pip install pillow cairosvg -ENV DCRDEVDOCS_CARDS true +ENV DCRDEVDOCS_CARDS="true" RUN ./bin/build_docs.sh # Serve image (stable nginx version) -FROM nginx:1.24-alpine +FROM nginx:1.28-alpine LABEL description="dcrdevdocs serve" LABEL version="1.0" -LABEL maintainer "jholdstock@decred.org" +LABEL maintainer="jholdstock@decred.org" COPY conf/nginx.conf /etc/nginx/conf.d/default.conf diff --git a/LICENSE b/LICENSE index e609e06..2e8823c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ ISC License -Copyright (c) 2018-2024 The Decred developers +Copyright (c) 2018-2025 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 diff --git a/README.md b/README.md index df0780e..e5878a7 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ dcrdevdocs In order to develop on `dcrdocs` you will need [Python](https://www.python.org/) installed on your system. -Version 3.9 is recommended because this is the version used by the live site, -however MkDocs does also support versions 3.6 and later. +Version 3.14 is recommended because this is the version used by the live site, +however MkDocs does also support versions 3.8 and later. Python 2 is not supported. You can verify your installation of Python by checking the output from these two diff --git a/bin/build.sh b/bin/build.sh index 6419efa..a28a73f 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -15,7 +15,9 @@ if [ "$1" != "" ]; then IMAGE_NAME=$1 fi -docker build -t $IMAGE_NAME . +# The default logging of the docker builder folds output which can hide +# important DEBUG/INFO messages. Use --progress==plain to prevent this. +docker build --progress=plain -t $IMAGE_NAME . echo "" echo "===================" diff --git a/mkdocs.yml b/mkdocs.yml index b307941..228db22 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -132,4 +132,4 @@ nav: - 'Regnet': 'environments/regnet.md' - Contributing: - 'Contributor Guidelines': 'contributing/contributor-guidelines.md' -copyright: If you wish to improve this site, please open an issue or send a pull request.
dcrdevdocs v0.0.1. Decred Project 2020-2024. +copyright: If you wish to improve this site, please open an issue or send a pull request.
dcrdevdocs v0.0.1. Decred Project 2020-2025. diff --git a/requirements.txt b/requirements.txt index 4f7d9f7..8b2e2fb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -mkdocs-material==9.5.21 -mkdocs-markdownextradata-plugin==0.2.5 +mkdocs-material==9.7.0 +mkdocs-markdownextradata-plugin==0.2.6 \ No newline at end of file