Skip to content

Commit

Permalink
minor: add new version v2.7
Browse files Browse the repository at this point in the history
  • Loading branch information
tboerger committed Aug 9, 2023
1 parent 3ee70bd commit e4342bc
Show file tree
Hide file tree
Showing 16 changed files with 589 additions and 0 deletions.
159 changes: 159 additions & 0 deletions .github/workflows/v2.7.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
---
name: v2.7

"on":
push:
branches:
- master
paths:
- v2.7/*
- .github/workflows/v2.7.yml
pull_request:
branches:
- master
paths:
- v2.7/*
- .github/workflows/v2.7.yml
workflow_dispatch:

jobs:
docker:
runs-on: ubuntu-latest

steps:
- name: Checkout source
id: source
uses: actions/checkout@v3

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
images: |
webhippie/apache
quay.io/webhippie/apache
ghcr.io/dockhippie/apache
labels: |
org.opencontainers.image.vendor=Webhippie
maintainer=Thomas Boerger <thomas@webhippie.de>
- name: Setup QEMU
id: qemu
uses: docker/setup-qemu-action@v2

- name: Setup Buildx
id: buildx
uses: docker/setup-buildx-action@v2

- name: Hub login
id: login1
uses: docker/login-action@v2
if: github.event_name != 'pull_request'
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Quay login
id: login2
uses: docker/login-action@v2
if: github.event_name != 'pull_request'
with:
registry: quay.io
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_PASSWORD }}

- name: Ghcr login
id: login3
uses: docker/login-action@v2
if: github.event_name != 'pull_request'
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build amd64
id: amd64
uses: docker/build-push-action@v4
with:
builder: ${{ steps.buildx.outputs.name }}
context: v2.7/
provenance: false
file: v2.7/Dockerfile.amd64
platforms: linux/amd64
push: ${{ github.event_name != 'pull_request' }}
labels: ${{ steps.meta.outputs.labels }}
tags: |
webhippie/caddy:2.7-amd64
quay.io/webhippie/caddy:2.7-amd64
ghcr.io/dockhippie/caddy:2.7-amd64
- name: Build arm64
id: arm64
uses: docker/build-push-action@v4
with:
builder: ${{ steps.buildx.outputs.name }}
context: v2.7/
provenance: false
file: v2.7/Dockerfile.arm64
platforms: linux/arm64
push: ${{ github.event_name != 'pull_request' }}
labels: ${{ steps.meta.outputs.labels }}
tags: |
webhippie/caddy:2.7-arm64
quay.io/webhippie/caddy:2.7-arm64
ghcr.io/dockhippie/caddy:2.7-arm64
- name: Build arm
id: arm
uses: docker/build-push-action@v4
with:
builder: ${{ steps.buildx.outputs.name }}
context: v2.7/
provenance: false
file: v2.7/Dockerfile.arm
platforms: linux/arm/v6
push: ${{ github.event_name != 'pull_request' }}
labels: ${{ steps.meta.outputs.labels }}
tags: |
webhippie/caddy:2.7-arm
quay.io/webhippie/caddy:2.7-arm
ghcr.io/dockhippie/caddy:2.7-arm
- name: Hub manifest
id: manifest1
uses: actionhippie/manifest@v1
if: github.event_name != 'pull_request'
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
platforms: linux/amd64,linux/arm64,linux/arm/v6
template: webhippie/caddy:2.7-ARCH
target: webhippie/caddy:2.7
ignore_missing: true

- name: Quay manifest
id: manifest2
uses: actionhippie/manifest@v1
if: github.event_name != 'pull_request'
with:
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_PASSWORD }}
platforms: linux/amd64,linux/arm64,linux/arm/v6
template: quay.io/webhippie/caddy:2.7-ARCH
target: quay.io/webhippie/caddy:2.7
ignore_missing: true

- name: Ghcr manifest
id: manifest3
uses: actionhippie/manifest@v1
if: github.event_name != 'pull_request'
with:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
platforms: linux/amd64,linux/arm64,linux/arm/v6
template: ghcr.io/dockhippie/caddy:2.7-ARCH
target: ghcr.io/dockhippie/caddy:2.7
ignore_missing: true

...
36 changes: 36 additions & 0 deletions v2.7/Dockerfile.amd64
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
FROM ghcr.io/dockhippie/golang:1.20-amd64@sha256:4a2008ce489e7051fb8d39405e1d3be502be7927d6c620a68e56266b975e2e76 AS build

# renovate: datasource=github-releases depName=caddyserver/caddy
ENV CADDY_VERSION=2.7.3

# renovate: datasource=github-releases depName=caddyserver/xcaddy
ENV XCADDY_VERSION=0.3.5

# renovate: datasource=github-tags depName=ggicci/caddy-jwt
ENV JWT_VERSION=v0.9.1

# renovate: datasource=github-tags depName=MagnaXSoftware/gopkg
ENV GOPKG_VERSION=v1.2.0

RUN curl -sSLo - https://github.com/caddyserver/xcaddy/releases/download/v${XCADDY_VERSION}/xcaddy_${XCADDY_VERSION}_linux_amd64.tar.gz | tar -xvz -C /tmp && \
/tmp/xcaddy build v${CADDY_VERSION} \
--with github.com/ggicci/caddy-jwt@${JWT_VERSION} \
--with magnax.ca/caddy/gopkg@${GOPKG_VERSION}

FROM ghcr.io/dockhippie/alpine:latest-amd64@sha256:8625a244a26b90bc5c802c4449154d23bda974fb6b8c341c929daa99cd056305

EXPOSE 8080

WORKDIR /srv/www
CMD ["/usr/bin/container"]

RUN apk update && \
apk upgrade && \
mkdir -p /home/caddy/.config/caddy && \
groupadd -g 1000 caddy && \
useradd -u 1000 -d /home/caddy -g caddy -s /bin/bash -M caddy && \
apk add mailcap && \
rm -rf /var/cache/apk/*

COPY --from=build /srv/app/caddy /usr/sbin/caddy
COPY ./overlay /
36 changes: 36 additions & 0 deletions v2.7/Dockerfile.arm
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
FROM ghcr.io/dockhippie/golang:1.20-arm@sha256:fe2fc89810395055f3c28b03cb609cb0d663b6354d11b34ba48680ebb4552cd8 AS build

# renovate: datasource=github-releases depName=caddyserver/caddy
ENV CADDY_VERSION=2.7.3

# renovate: datasource=github-releases depName=caddyserver/xcaddy
ENV XCADDY_VERSION=0.3.5

# renovate: datasource=github-tags depName=ggicci/caddy-jwt
ENV JWT_VERSION=v0.9.1

# renovate: datasource=github-tags depName=MagnaXSoftware/gopkg
ENV GOPKG_VERSION=v1.2.0

RUN curl -sSLo - https://github.com/caddyserver/xcaddy/releases/download/v${XCADDY_VERSION}/xcaddy_${XCADDY_VERSION}_linux_armv6.tar.gz | tar -xvz -C /tmp && \
/tmp/xcaddy build v${CADDY_VERSION} \
--with github.com/ggicci/caddy-jwt@${JWT_VERSION} \
--with magnax.ca/caddy/gopkg@${GOPKG_VERSION}

FROM ghcr.io/dockhippie/alpine:latest-arm@sha256:b4b521c8229a803f530feb976bc7d46f9a63ed7050d320af5d9ea1f910dab022

EXPOSE 8080

WORKDIR /srv/www
CMD ["/usr/bin/container"]

RUN apk update && \
apk upgrade && \
mkdir -p /home/caddy/.config/caddy && \
groupadd -g 1000 caddy && \
useradd -u 1000 -d /home/caddy -g caddy -s /bin/bash -M caddy && \
apk add mailcap && \
rm -rf /var/cache/apk/*

COPY --from=build /srv/app/caddy /usr/sbin/caddy
COPY ./overlay /
36 changes: 36 additions & 0 deletions v2.7/Dockerfile.arm64
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
FROM ghcr.io/dockhippie/golang:1.20-arm64@sha256:6febc16e362b54d86bbaf14abcf74a84678f7b76b1a2cf54d82ff981b2c7d177 AS build

# renovate: datasource=github-releases depName=caddyserver/caddy
ENV CADDY_VERSION=2.7.3

# renovate: datasource=github-releases depName=caddyserver/xcaddy
ENV XCADDY_VERSION=0.3.5

# renovate: datasource=github-tags depName=ggicci/caddy-jwt
ENV JWT_VERSION=v0.9.1

# renovate: datasource=github-tags depName=MagnaXSoftware/gopkg
ENV GOPKG_VERSION=v1.2.0

RUN curl -sSLo - https://github.com/caddyserver/xcaddy/releases/download/v${XCADDY_VERSION}/xcaddy_${XCADDY_VERSION}_linux_arm64.tar.gz | tar -xvz -C /tmp && \
/tmp/xcaddy build v${CADDY_VERSION} \
--with github.com/ggicci/caddy-jwt@${JWT_VERSION} \
--with magnax.ca/caddy/gopkg@${GOPKG_VERSION}

FROM ghcr.io/dockhippie/alpine:latest-arm64@sha256:cf76796c3edf88c31a47aba4398a85dcfc366710d8df0886abddc2c806791e6d

EXPOSE 8080

WORKDIR /srv/www
CMD ["/usr/bin/container"]

RUN apk update && \
apk upgrade && \
mkdir -p /home/caddy/.config/caddy && \
groupadd -g 1000 caddy && \
useradd -u 1000 -d /home/caddy -g caddy -s /bin/bash -M caddy && \
apk add mailcap && \
rm -rf /var/cache/apk/*

COPY --from=build /srv/app/caddy /usr/sbin/caddy
COPY ./overlay /
Loading

0 comments on commit e4342bc

Please sign in to comment.