Compare commits

...

4 Commits

Author SHA1 Message Date
62b99a54dc update woodpecker based ci pipelines (#57)
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
#### 📖 Summary

<!-- Provide a summary of your changes. Describe the why and not how. -->

#### 📑 Test Plan

> 💡 Select your test plan for the code changes.

- [x] CI pipeline
- [ ] Custom test
- [ ] No test plan

##### Details / Justification

<!-- Add your test details or justification for missing tests here. -->

#### 📚 Additional Notes

<!-- A place for additional detail notes. -->

Reviewed-on: #57
2024-05-08 10:05:25 +02:00
000e7d2836 fix umami script name
Some checks failed
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/push/next Pipeline was successful
ci/woodpecker/push/renovate Pipeline was successful
ci/woodpecker/push/master Pipeline failed
2024-05-08 09:44:29 +02:00
dc10ab67a8 fix typo
Some checks failed
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/push/next Pipeline was successful
ci/woodpecker/push/renovate Pipeline was successful
ci/woodpecker/push/master Pipeline failed
2024-03-24 09:26:43 +01:00
ad2d82e5aa pin sevice to ipv4 (#50)
#### 📖 Summary

<!-- Provide a summary of your changes. Describe the why and not how. -->

- workaround for ipv6 issue after updating docker
- disable healtcheck due to timing issues

#### 📑 Test Plan

> 💡 Select your test plan for the code changes.

- [x] CI pipeline
- [ ] Custom test
- [ ] No test plan

##### Details / Justification

<!-- Add your test details or justification for missing tests here. -->

#### 📚 Additional Notes

<!-- A place for additional detail notes. -->

Reviewed-on: #50
2024-03-24 09:24:16 +01:00
9 changed files with 75 additions and 156 deletions

70
.woodpecker/ci.yml Normal file
View File

@ -0,0 +1,70 @@
when:
- event: [pull_request, tag, cron]
- event: push
branch:
- ${CI_REPO_DEFAULT_BRANCH}
variables:
- &build_plugin 'woodpeckerci/plugin-docker-buildx:3.2.1'
# deployment targets
- &publish_repos 'ocram85/blog,gitea.ocram85.com/ocram85/blog'
# logins for deployment targets
- publish_logins: &publish_logins
# Default DockerHub login
- registry: https://index.docker.io/v1/
username:
from_secret: hub_user
password:
from_secret: hub_passwd
# Additional Quay.IO login
- registry: https://gitea.ocram85.com
username:
from_secret: gitea_user
password:
from_secret: gitea_passwd
steps:
test:
image: *build_plugin
settings:
dry_run: true
registry: gitea.ocram85.com
repo: test
dockerfile: Dockerfile
platforms: linux/amd64
auto_tag: true
#build_args:
# - VERSION=${CI_COMMIT_TAG:-PR ${CI_COMMIT_PULL_REQUEST}}
# - TAG=${CI_COMMIT_TAG}
when:
event: pull_request
branch: ${CI_REPO_DEFAULT_BRANCH}
publish:
image: *build_plugin
settings:
repo: *publish_repos
dockerfile: Dockerfile
platforms: linux/amd64
auto_tag: true
logins: *publish_logins
#build_args:
# - VERSION=${CI_COMMIT_TAG:-PR ${CI_COMMIT_PULL_REQUEST}}
# - TAG=${CI_COMMIT_TAG}
when:
event: [push, tag, cron]
branch: ${CI_REPO_DEFAULT_BRANCH}
build-next:
image: *build_plugin
settings:
repo: *publish_repos
dockerfile: Dockerfile
platforms: linux/amd64
tag: next
logins: *publish_logins
#build_args:
# - VERSION=${CI_COMMIT_TAG:-PR ${CI_COMMIT_PULL_REQUEST}}
# - TAG=${CI_COMMIT_TAG}
when:
event: [pull_request]

View File

@ -1,66 +0,0 @@
depends_on:
- test
pipeline:
buildMaster:
image: plugins/docker
settings:
repo: ocram85/blog
dockerfile: Dockerfile
auto_tag: true
build_args:
- NODE_BASE=lts-buster-slim
- NGINX_BASE=1.23.1-alpine
username:
from_secret: hub_user
password:
from_secret: hub_passwd
when:
event: push
branch: master
buildMasterGitea:
image: plugins/docker
settings:
registry: gitea.ocram85.com
repo: gitea.ocram85.com/ocram85/blog
dockerfile: Dockerfile
auto_tag: true
build_args:
- NODE_BASE=lts-buster-slim
- NGINX_BASE=1.23.1-alpine
username:
from_secret: gitea_user
password:
from_secret: gitea_passwd
when:
event: push
branch: master
trivyMaster:
image: aquasec/trivy:0.36.1
commands:
- |
trivy image \
--severity UNKNOWN,LOW,MEDIUM \
--no-progress \
ocram85/blog:latest
- |
trivy image \
--severity HIGH,CRITICAL \
--no-progress \
ocram85/blog:latest
when:
event: push
branch: master
triggerPortainerMaster:
image: ocram85/portainer-serviceupdate
settings:
#VERBOSE: true
URI: "https://portainer.ocram85.com"
TOKEN:
from_secret: TOKEN
when:
event: push
branch: master

View File

@ -1,56 +0,0 @@
depends_on:
- test
pipeline:
buildNext:
image: woodpeckerci/plugin-docker-buildx
settings:
repo: ocram85/blog
dockerfile: Dockerfile
tags: next
username:
from_secret: hub_user
password:
from_secret: hub_passwd
when:
event: pull_request
buildNextGitea:
image: woodpeckerci/plugin-docker-buildx
settings:
registry: gitea.ocram85.com
repo: gitea.ocram85.com/ocram85/blog
dockerfile: Dockerfile
tags: next
username:
from_secret: gitea_user
password:
from_secret: gitea_passwd
when:
event: pull_request
trivyNext:
image: aquasec/trivy:0.36.1
commands:
- |
trivy image \
--severity UNKNOWN,LOW,MEDIUM \
--no-progress \
ocram85/blog:next
- |
trivy image \
--severity HIGH,CRITICAL \
--no-progress \
ocram85/blog:next
when:
event: pull_request
triggerPortainer:
image: ocram85/portainer-serviceupdate
settings:
#VERBOSE: true
URI: "https://portainer.ocram85.com"
TOKEN:
from_secret: NEXT_TOKEN
when:
event: pull_request

View File

@ -1,22 +0,0 @@
pipeline:
DockerBaseImage:
image: renovate/renovate:34.108-slim
commands:
- "renovate"
secrets:
- RENOVATE_TOKEN
environment:
#LOG_LEVEL: debug
RENOVATE_PLATFORM: "gitea"
RENOVATE_ENDPOINT: "https://gitea.ocram85.com"
RENOVATE_REPOSITORIES: "${CI_REPO}"
RENOVATE_LABELS: "renovate"
#RENOVATE_DRY_RUN: "full"
RENOVATE_TOKEN: "${RENOVATE_TOKEN}"
RENOVATE_GITHUB_TOKEN_WARN: "false"
when:
event:
- push
branch:
- master
- updDeps

View File

@ -1,7 +0,0 @@
pipeline:
build:
image: node:lts-buster-slim
commands:
- npm install
- npm run test
- npm run build

View File

@ -8,7 +8,7 @@ RUN npm install \
FROM nginx:1.23.3-alpine as prod
LABEL maintainer="marco.blessing@googlemail.com"
HEALTHCHECK --interval=15s --timeout=5s \
CMD wget --no-verbose --tries=1 --spider http://localhost:80/ || exit 1
#HEALTHCHECK --interval=15s --timeout=5s \
# CMD wget --no-verbose --tries=1 --spider http://localhost:80/ || exit 1
COPY --from=builder src/public /usr/share/nignx/html/
COPY nginx.conf /etc/nginx/nginx.conf

View File

@ -43,4 +43,4 @@ The next tag is used for testing any code changes on development branches and pu
This image contains the hugo based sources for my personal blog. It's made with the [Congo theme](https://github.com/jpanther/congo). The static pages are served by the included nginx server with a custom config. The custom config is needed to redirect 404 errors to a custom page.
You can simply run the container with `docker run -it --rm -p "8080:80" ocram85/blog:latest`
You can simply run the container with `docker run -it --rm -p "8080:80" ocram85/blog:latest`.

View File

@ -2,6 +2,6 @@
async
defer
data-website-id="3e944f0b-6377-4a23-8bdd-64b408d13611"
src="https://umami.ocram85.com/umami.js"
src="https://umami.ocram85.com/script.js"
data-domains="ocram85.com"
></script>

View File

@ -5,7 +5,7 @@ http {
include mime.types;
server {
listen 80;
listen 0.0.0.0:80;
root /usr/share/nignx/html;
index index.html;
error_page 404 /404.html;