Skip to content
Merged
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
8 changes: 4 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,28 @@ updates:
timezone: Etc/UTC
open-pull-requests-limit: 10
- package-ecosystem: docker
directory: "/2.10/windows/1809"
directory: "/2.10/windows/ltsc2022"
schedule:
interval: daily
time: "02:00"
timezone: Etc/UTC
open-pull-requests-limit: 10
- package-ecosystem: docker
directory: "/2.10/windows/ltsc2022"
directory: "/2.10/windows/ltsc2025"
schedule:
interval: daily
time: "02:00"
timezone: Etc/UTC
open-pull-requests-limit: 10
- package-ecosystem: docker
directory: "/2.10/windows-builder/1809"
directory: "/2.10/windows-builder/ltsc2022"
schedule:
interval: daily
time: "02:00"
timezone: Etc/UTC
open-pull-requests-limit: 10
- package-ecosystem: docker
directory: "/2.10/windows-builder/ltsc2022"
directory: "/2.10/windows-builder/ltsc2025"
schedule:
interval: daily
time: "02:00"
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,29 +34,30 @@ jobs:
run: |
bashbrew push --dry-run caddy
if: github.repository != 'caddyserver/caddy-docker' || github.ref != 'refs/heads/master'

docker-windows-build:
runs-on: windows-2019
runs-on: windows-2022
# env:
# BASHBREW_LIBRARY: ./library
# BASHBREW_NAMESPACE: caddy
steps:
- uses: actions/checkout@master
- name: non-master build test
run: |
docker build -f 2.10/windows/1809/Dockerfile 2.10/windows
docker build -f 2.10/windows/ltsc2022/Dockerfile 2.10/windows/ltsc2022
if: github.repository != 'caddyserver/caddy-docker' || github.ref != 'refs/heads/master'
- name: install bashbrew
run: curl -o /bashbrew.exe https://doi-janky.infosiftr.net/job/bashbrew/job/master/lastSuccessfulBuild/artifact/bashbrew-windows-amd64.exe
- name: build
run: /bashbrew --arch windows-amd64 --constraint windowsservercore-1809 --namespace caddy --library ./library build caddy
run: /bashbrew --arch windows-amd64 --constraint windowsservercore-ltsc2022 --namespace caddy --library ./library build caddy
- name: push
# NOTE: DOCKERHUB_TOKEN and DOCKERHUB_USERNAME must be present in https://github.com/caddyserver/caddy-docker/settings
# the user must have permission to push to https://hub.docker.com/r/caddy/caddy
run: |
echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login --username ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin;
/bashbrew --arch windows-amd64 --constraint windowsservercore-1809 --namespace caddy --library ./library push caddy
/bashbrew --arch windows-amd64 --constraint windowsservercore-ltsc2022 --namespace caddy --library ./library push caddy
if: github.repository == 'caddyserver/caddy-docker' && github.ref == 'refs/heads/master'
- name: push (non-master dry run)
run: |
/bashbrew --arch windows-amd64 --constraint windowsservercore-1809 --namespace caddy --library ./library push --dry-run caddy
/bashbrew --arch windows-amd64 --constraint windowsservercore-ltsc2022 --namespace caddy --library ./library push --dry-run caddy
if: github.repository != 'caddyserver/caddy-docker' || github.ref != 'refs/heads/master'
1 change: 0 additions & 1 deletion 2.10/windows-builder/1809/Dockerfile.base

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23-windowsservercore-1809
FROM golang:1.23-windowsservercore-ltsc2025

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

Expand Down
1 change: 1 addition & 0 deletions 2.10/windows-builder/ltsc2025/Dockerfile.base
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FROM golang:1.23-windowsservercore-ltsc2025
1 change: 0 additions & 1 deletion 2.10/windows/1809/Dockerfile.base

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/windows/servercore:1809
FROM mcr.microsoft.com/windows/servercore:ltsc2025

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

Expand Down
1 change: 1 addition & 0 deletions 2.10/windows/ltsc2025/Dockerfile.base
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FROM mcr.microsoft.com/windows/servercore:ltsc2025
20 changes: 10 additions & 10 deletions stackbrew-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ variants:
tags: [ "builder-alpine" ]
shared_tags: [ "builder" ]
architectures: [ amd64, arm64v8, arm32v6, arm32v7, ppc64le, riscv64, s390x ]
- dir: windows/1809
base_file: Dockerfile.windowsservercore-1809.base
tags: [ "windowsservercore-1809" ]
shared_tags: [ "windowsservercore", "latest" ]
architectures: [ windows-amd64 ]
constraints: [ windowsservercore-1809 ]
- dir: windows/ltsc2022
base_file: Dockerfile.windowsservercore-ltsc2022.base
tags: [ "windowsservercore-ltsc2022" ]
shared_tags: [ "windowsservercore", "latest" ]
architectures: [ windows-amd64 ]
constraints: [ windowsservercore-ltsc2022 ]
- dir: windows-builder/1809
tags: [ "builder-windowsservercore-1809" ]
shared_tags: [ "builder" ]
- dir: windows/ltsc2025
base_file: Dockerfile.windowsservercore-ltsc2025.base
tags: [ "windowsservercore-ltsc2025" ]
shared_tags: [ "windowsservercore", "latest" ]
architectures: [ windows-amd64 ]
constraints: [ windowsservercore-1809 ]
constraints: [ windowsservercore-ltsc2025 ]
- dir: windows-builder/ltsc2022
tags: [ "builder-windowsservercore-ltsc2022" ]
shared_tags: [ "builder" ]
architectures: [ windows-amd64 ]
constraints: [ windowsservercore-ltsc2022 ]
- dir: windows-builder/ltsc2025
tags: [ "builder-windowsservercore-ltsc2025" ]
shared_tags: [ "builder" ]
architectures: [ windows-amd64 ]
constraints: [ windowsservercore-ltsc2025 ]