Compare commits

..

2 Commits

Author SHA1 Message Date
fb3ffccad8 Update nginx Docker tag to v1.23.2
All checks were successful
ci/woodpecker/push/renovate Pipeline was successful
ci/woodpecker/pr/renovate Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/push/next Pipeline was successful
ci/woodpecker/pr/test Pipeline was successful
ci/woodpecker/push/master Pipeline was successful
ci/woodpecker/pr/master Pipeline was successful
ci/woodpecker/pr/next Pipeline was successful
2022-12-07 19:26:50 +00:00
4f2c65b69f debug woodpecker renovate (#29)
All checks were successful
ci/woodpecker/push/renovate Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/push/next Pipeline was successful
ci/woodpecker/push/master Pipeline was successful
#### 📖 Summary

- remove leading . in pipeline files.
- remove build arg for renovate support.

#### 📑 Test Plan

> 💡 Select your test plan for the code changes.

- [x] Tested via 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. -->

Co-authored-by: OCram85 <marco.blessing@googlemail.com>
Reviewed-on: #29
2022-12-07 20:26:35 +01:00
6 changed files with 11 additions and 20 deletions

View File

@ -47,7 +47,6 @@ pipeline:
ocram85/blog:latest
- |
trivy image \
--exit-code 1 \
--severity HIGH,CRITICAL \
--no-progress \
ocram85/blog:latest

View File

@ -3,15 +3,11 @@ depends_on:
pipeline:
buildNext:
image: plugins/docker
image: woodpeckerci/plugin-docker-buildx
settings:
#dry_run: true
repo: ocram85/blog
dockerfile: Dockerfile
tags: next
build_args:
- NODE_BASE=lts-buster-slim
- NGINX_BASE=1.23.1-alpine
username:
from_secret: hub_user
password:
@ -20,16 +16,12 @@ pipeline:
event: pull_request
buildNextGitea:
image: plugins/docker
image: woodpeckerci/plugin-docker-buildx
settings:
#dry_run: true
registry: gitea.ocram85.com
repo: gitea.ocram85.com/ocram85/blog
dockerfile: Dockerfile
tags: next
build_args:
- NODE_BASE=lts-buster-slim
- NGINX_BASE=1.23.1-alpine
username:
from_secret: gitea_user
password:
@ -47,7 +39,6 @@ pipeline:
ocram85/blog:next
- |
trivy image \
--exit-code 1 \
--severity HIGH,CRITICAL \
--no-progress \
ocram85/blog:next

View File

@ -1,12 +1,12 @@
pipeline:
DockerBaseImage:
image: renovate/renovate:34.22-slim
image: renovate/renovate:34.40-slim
commands:
- "renovate"
secrets:
- RENOVATE_TOKEN
environment:
#LOG_LEVEL: debug
LOG_LEVEL: debug
RENOVATE_PLATFORM: "gitea"
RENOVATE_ENDPOINT: "https://gitea.ocram85.com"
RENOVATE_REPOSITORIES: "${CI_REPO}"

View File

@ -1,8 +1,4 @@
# Build ARGS for base image versions
ARG NODE_BASE=lts-buster-slim
ARG NGINX_BASE=1.23.2-alpine
FROM node:${NODE_BASE} as builder
FROM node:lts-buster-slim as builder
COPY . /src
#RUN ls -la
WORKDIR /src
@ -10,7 +6,7 @@ WORKDIR /src
RUN npm install \
&& npm run build
FROM nginx:${NGINX_BASE} as prod
FROM nginx:1.23.2-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

View File

@ -1,4 +1,9 @@
{
"onboardingConfig": {
"extends": [
"config:base"
]
},
"dependencyDashboard": true,
"docker": {
"enabled": true