Merge branch 'main' of github.com:miniflux/v2 into patch-1

.devcontainer/devcontainer.json

@@ -0,0 +1,23 @@
+{
+ "name": "Miniflux",
+ "dockerComposeFile": "docker-compose.yml",
+ "service": "app",
+ "workspaceFolder": "/workspace",
+ "remoteUser": "vscode",
+ "forwardPorts": [
+ 8080
+ ],
+ "customizations": {
+ "vscode": {
+ "settings": {
+ "go.toolsManagement.checkForUpdates": "local",
+ "go.useLanguageServer": true,
+ "go.gopath": "/go"
+ },
+ "extensions": [
+ "ms-azuretools.vscode-docker",
+ "golang.go"
+ ]
+ }
+ }
+}

.devcontainer/docker-compose.yml

@@ -0,0 +1,27 @@
+version: '3.8'
+services:
+ app:
+ image: mcr.microsoft.com/devcontainers/go
+ volumes:
+ - ..:/workspace:cached
+ command: sleep infinity
+ network_mode: service:db
+ environment:
+ - CREATE_ADMIN=1
+ - ADMIN_USERNAME=admin
+ - ADMIN_PASSWORD=test123
+ db:
+ image: postgres:15
+ restart: unless-stopped
+ volumes:
+ - postgres-data:/var/lib/postgresql/data
+ hostname: postgres
+ environment:
+ POSTGRES_DB: miniflux2
+ POSTGRES_USER: postgres
+ POSTGRES_PASSWORD: postgres
+ POSTGRES_HOST_AUTH_METHOD: trust
+ ports:
+ - 5432:5432
+volumes:
+ postgres-data: null

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a bug report
 title: ''
-labels: bug
+labels: bug, question / discussion
 assignees: ''
 
 ---

.github/codeql/config.yml

@@ -0,0 +1,2 @@
+paths-ignore:
+- ./http/client/testdata

.github/dependabot.yml

@@ -2,6 +2,15 @@ version: 2
 updates:
  - package-ecosystem: "gomod"
  directory: "/"
+ schedule:
+ interval: "daily"
+ reviewers:
+ - "fguillot"
+ assignees:
+ - "fguillot"
+
+ - package-ecosystem: "docker"
+ directory: "/packaging/docker/alpine"
  schedule:
  interval: "weekly"
  reviewers:
@@ -10,6 +19,15 @@ updates:
  - "fguillot"
 
  - package-ecosystem: "docker"
+ directory: "/packaging/docker/distroless"
+ schedule:
+ interval: "weekly"
+ reviewers:
+ - "fguillot"
+ assignees:
+ - "fguillot"
+
+ - package-ecosystem: "github-actions"
  directory: "/"
  schedule:
  interval: "weekly"

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ permissions: read-all
 on:
  pull_request:
  branches:
- - master
+ - main
 
 jobs:
  unit-tests:
@@ -14,14 +14,14 @@ jobs:
  max-parallel: 4
  matrix:
  os: [ubuntu-latest, windows-latest, macOS-latest]
- go-version: [1.16, 1.17, 1.18]
+ go-version: ["1.19", "1.20"]
  steps:
  - name: Set up Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v4
  with:
  go-version: ${{ matrix.go-version }}
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  - name: Run unit tests
  run: make test
 
@@ -40,13 +40,13 @@ jobs:
  options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
  steps:
  - name: Set up Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v4
  with:
- go-version: 1.16
+ go-version: "1.20"
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  - name: Install Postgres client
- run: sudo apt-get install -y postgresql-client
+ run: sudo apt update && sudo apt install -y postgresql-client
  - name: Run integration tests
  run: make integration-test
  env:

.github/workflows/codeql-analysis.yml

@@ -1,24 +1,13 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
 name: "CodeQL"
 
 permissions: read-all
 
 on:
  push:
- branches: [ master ]
+ branches: [ main ]
  pull_request:
  # The branches below must be a subset of the branches above
- branches: [ master ]
+ branches: [ main ]
  schedule:
  - cron: '45 22 * * 3'
 
@@ -35,38 +24,19 @@ jobs:
  fail-fast: false
  matrix:
  language: [ 'go', 'javascript' ]
- # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
- # Learn more about CodeQL language support at https://git.io/codeql-language-support
 
  steps:
  - name: Checkout repository
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
 
- # Initializes the CodeQL tools for scanning.
  - name: Initialize CodeQL
- uses: github/codeql-action/init@v1
+ uses: github/codeql-action/init@v2
  with:
  languages: ${{ matrix.language }}
- # If you wish to specify custom queries, you can do so here or in a config file.
- # By default, queries listed here will override any specified in a config file.
- # Prefix the list here with "+" to use these queries and those in the config file.
- # queries: ./path/to/local/query, your-org/your-repo/queries@main
+ config-file: ./.github/codeql/config.yml
 
- # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
- # If this step fails, then you should remove it and run the build manually (see below)
  - name: Autobuild
- uses: github/codeql-action/autobuild@v1
-
- # ℹ️ Command-line programs to run using the OS shell.
- # 📚 https://git.io/JvXDl
-
- # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
- # and modify them (or add more) to build your code if your project
- # uses a compiled language
-
- #- run: |
- # make bootstrap
- # make release
+ uses: github/codeql-action/autobuild@v2
 
  - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v1
+ uses: github/codeql-action/analyze@v2

.github/workflows/docker.yml

@@ -1,5 +1,4 @@
 name: Docker
-permissions: read-all
 on:
  schedule:
  - cron: '0 1 * * *'
@@ -8,10 +7,12 @@ on:
  - '*.*.*'
 jobs:
  docker-images:
+ permissions:
+ packages: write
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  with:
  fetch-depth: 0
 
@@ -22,10 +23,10 @@ jobs:
  DOCKER_VERSION=dev
  if [ "${{ github.event_name }}" = "schedule" ]; then
  DOCKER_VERSION=nightly
- TAGS="${DOCKER_IMAGE}:${DOCKER_VERSION},ghcr.io/${DOCKER_IMAGE}:${DOCKER_VERSION}"
+ TAGS="docker.io/${DOCKER_IMAGE}:${DOCKER_VERSION},ghcr.io/${DOCKER_IMAGE}:${DOCKER_VERSION},quay.io/${DOCKER_IMAGE}:${DOCKER_VERSION}"
  elif [[ $GITHUB_REF == refs/tags/* ]]; then
  DOCKER_VERSION=${GITHUB_REF#refs/tags/}
- TAGS="${DOCKER_IMAGE}:${DOCKER_VERSION},ghcr.io/${DOCKER_IMAGE}:${DOCKER_VERSION},${DOCKER_IMAGE}:latest,ghcr.io/${DOCKER_IMAGE}:latest"
+ TAGS="docker.io/${DOCKER_IMAGE}:${DOCKER_VERSION},ghcr.io/${DOCKER_IMAGE}:${DOCKER_VERSION},quay.io/${DOCKER_IMAGE}:${DOCKER_VERSION},docker.io/${DOCKER_IMAGE}:latest,ghcr.io/${DOCKER_IMAGE}:latest,quay.io/${DOCKER_IMAGE}:latest"
  fi
  echo ::set-output name=tags::${TAGS}
 
@@ -36,34 +37,41 @@ jobs:
  DOCKER_VERSION=dev-distroless
  if [ "${{ github.event_name }}" = "schedule" ]; then
  DOCKER_VERSION=nightly-distroless
- TAGS="${DOCKER_IMAGE}:${DOCKER_VERSION},ghcr.io/${DOCKER_IMAGE}:${DOCKER_VERSION}"
+ TAGS="docker.io/${DOCKER_IMAGE}:${DOCKER_VERSION},ghcr.io/${DOCKER_IMAGE}:${DOCKER_VERSION},quay.io/${DOCKER_IMAGE}:${DOCKER_VERSION}"
  elif [[ $GITHUB_REF == refs/tags/* ]]; then
  DOCKER_VERSION=${GITHUB_REF#refs/tags/}-distroless
- TAGS="${DOCKER_IMAGE}:${DOCKER_VERSION},ghcr.io/${DOCKER_IMAGE}:${DOCKER_VERSION},${DOCKER_IMAGE}:latest-distroless,ghcr.io/${DOCKER_IMAGE}:latest-distroless"
+ TAGS="docker.io/${DOCKER_IMAGE}:${DOCKER_VERSION},ghcr.io/${DOCKER_IMAGE}:${DOCKER_VERSION},quay.io/${DOCKER_IMAGE}:${DOCKER_VERSION},docker.io/${DOCKER_IMAGE}:latest-distroless,ghcr.io/${DOCKER_IMAGE}:latest-distroless,quay.io/${DOCKER_IMAGE}:latest-distroless"
  fi
  echo ::set-output name=tags::${TAGS}
 
  - name: Set up QEMU
- uses: docker/setup-qemu-action@v1
+ uses: docker/setup-qemu-action@v2
 
  - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v1
+ uses: docker/setup-buildx-action@v2
 
  - name: Login to DockerHub
- uses: docker/login-action@v1 
+ uses: docker/login-action@v2 
  with:
  username: ${{ secrets.DOCKERHUB_USERNAME }}
  password: ${{ secrets.DOCKERHUB_TOKEN }}
 
  - name: Login to GitHub Container Registry
- uses: docker/login-action@v1 
+ uses: docker/login-action@v2 
  with:
  registry: ghcr.io
  username: ${{ github.repository_owner }}
- password: ${{ secrets.CR_PAT }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Login to Quay Container Registry
+ uses: docker/login-action@v2
+ with:
+ registry: quay.io
+ username: ${{ secrets.QUAY_USERNAME }}
+ password: ${{ secrets.QUAY_TOKEN }}
 
  - name: Build and Push Alpine images
- uses: docker/build-push-action@v2
+ uses: docker/build-push-action@v4
  with:
  context: .
  file: ./packaging/docker/alpine/Dockerfile
@@ -72,7 +80,7 @@ jobs:
  tags: ${{ steps.docker_alpine_tag.outputs.tags }}
 
  - name: Build and Push Distroless images
- uses: docker/build-push-action@v2
+ uses: docker/build-push-action@v4
  with:
  context: .
  file: ./packaging/docker/distroless/Dockerfile

.github/workflows/linters.yml

@@ -4,14 +4,14 @@ permissions: read-all
 on:
  pull_request:
  branches:
- - master
+ - main
 
 jobs:
  jshint:
  name: Javascript Linter
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: Install jshint
  run: |
  sudo npm install -g [email protected]
@@ -22,11 +22,10 @@ jobs:
  name: Golang Linter
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v2
- - uses: actions/setup-go@v2
+ - uses: actions/checkout@v3
+ - uses: actions/setup-go@v4
  with:
- go-version: 1.17
- - uses: golangci/golangci-lint-action@v2
+ go-version: "1.20"
+ - uses: golangci/golangci-lint-action@v3
  with:
  args: --skip-dirs tests --disable errcheck --enable sqlclosecheck --enable misspell --enable gofmt --enable goimports --enable whitespace
- skip-go-installation: true