diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index a3af6670..68b56929 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -5,16 +5,20 @@ on: branches: [ master ] tags: [ 'v*' ] pull_request: - branches: - - master - types: [closed] + # Comment these out to force a test build on a PR + #branches: + # - master + #types: [closed] env: DOCKER_HUB_SLUG: driveone/onedrive jobs: build: - if: (!(github.event.action == 'closed' && github.event.pull_request.merged != true)) + # Comment this out to force a test build on a PR + #if: (!(github.event.action == 'closed' && github.event.pull_request.merged != true)) + + # Build runs on runs-on: ubuntu-latest strategy: diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index c3616b77..fca95731 100644 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -1,6 +1,6 @@ # -*-Dockerfile-*- -ARG FEDORA_VERSION=37 +ARG FEDORA_VERSION=38 ARG DEBIAN_VERSION=bullseye ARG GO_VERSION=1.20 ARG GOSU_VERSION=1.16 diff --git a/contrib/docker/Dockerfile-alpine b/contrib/docker/Dockerfile-alpine index 21993e49..4db39a69 100644 --- a/contrib/docker/Dockerfile-alpine +++ b/contrib/docker/Dockerfile-alpine @@ -1,6 +1,6 @@ # -*-Dockerfile-*- -ARG ALPINE_VERSION=3.17 +ARG ALPINE_VERSION=3.18 ARG GO_VERSION=1.20 ARG GOSU_VERSION=1.16 diff --git a/contrib/docker/Dockerfile-debian b/contrib/docker/Dockerfile-debian index 906ba4aa..e71589e1 100644 --- a/contrib/docker/Dockerfile-debian +++ b/contrib/docker/Dockerfile-debian @@ -1,6 +1,6 @@ # -*-Dockerfile-*- -ARG DEBIAN_VERSION=bullseye +ARG DEBIAN_VERSION=stable FROM debian:${DEBIAN_VERSION} AS builder-onedrive