prskr/blog
1
0
Fork 0
Code Issues Pull requests 1 Activity Actions

refactor: use default caddy image

Browse source
This commit is contained in:
Peter 2022-12-30 15:11:02 +01:00
parent 0f7e7985d5
commit 6b9d26a883
Signed by: prskr
GPG key ID: C1DB5D2E8DB512F9
3 changed files with 10 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.concourse/pipeline.yml
View file

@ -12,6 +12,11 @@ resources:
source: source:
uri: https://code.icb4dc0.de/prskr/blog.git uri: https://code.icb4dc0.de/prskr/blog.git
- name: caddy-image
type: docker-image
source:
repository: code.icb4dc0.de/prskr/ci-images/caddy
- name: blog-chart - name: blog-chart
type: helm type: helm
source: source:
@ -26,6 +31,8 @@ jobs:
plan: plan:
- get: blog.git - get: blog.git
trigger: true trigger: true
- get: caddy-image
trigger: true
- task: build-container-image - task: build-container-image
file: blog.git/.concourse/tasks/image.yml file: blog.git/.concourse/tasks/image.yml
input_mapping: {repo: blog.git} input_mapping: {repo: blog.git}

13
Dockerfile
View file

@ -2,9 +2,7 @@ FROM docker.io/alpine:latest as builder
WORKDIR /tmp WORKDIR /tmp
RUN apk add -U --no-cache hugo curl tar jq && \ RUN apk add -U --no-cache hugo
export CADDY_VERSION=$(curl https://api.github.com/repos/caddyserver/caddy/releases/latest | jq -r '.tag_name | (sub("v";""))') && \
curl -L https://github.com/caddyserver/caddy/releases/download/v${CADDY_VERSION}/caddy_${CADDY_VERSION}_linux_amd64.tar.gz | tar -xvz caddy
WORKDIR /src WORKDIR /src
@ -12,13 +10,6 @@ COPY . /src/
RUN hugo --minify --environment production --config config.toml RUN hugo --minify --environment production --config config.toml
FROM gcr.io/distroless/static as final FROM code.icb4dc0.de/prskr/ci-images/caddy:latest as final
COPY --from=builder /tmp/caddy /bin
COPY --from=builder /src/public /usr/share/caddy COPY --from=builder /src/public /usr/share/caddy
COPY deploy/caddy/caddy.json /etc/caddy/caddy.json
EXPOSE 3000
ENTRYPOINT [ "/bin/caddy" ]
CMD [ "run", "--config=/etc/caddy/caddy.json" ]

41
deploy/caddy/caddy.json
View file

@ -1,41 +0,0 @@
{
"apps": {
"http": {
"servers": {
"blog": {
"listen": [
":3000"
],
"metrics": {},
"routes": [
{
"handle": [
{
"handler": "file_server",
"root": "/usr/share/caddy",
"index_names": [
"index.html"
]
}
]
}
]
},
"metrics" : {
"listen": [
":9100"
],
"routes": [
{
"handle": [
{
"handler": "metrics"
}
]
}
]
}
}
}
}
}