amarillo/amarillo-core
5
0
Fork 0
Code Issues 17 Pull requests Packages Projects Releases Wiki Activity

Run as amarillo user
All checks were successful
Amarillo/amarillo-gitea/amarillo-core/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
Csaba 2024-06-28 13:24:44 +02:00
parent 2a282231ed
commit 3e3766953b
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Jenkinsfile vendored
View file

@ -9,7 +9,7 @@ pipeline {
OWNER = 'amarillo' OWNER = 'amarillo'
BASE_IMAGE_NAME = 'amarillo-base' BASE_IMAGE_NAME = 'amarillo-base'
IMAGE_NAME = 'amarillo' IMAGE_NAME = 'amarillo'
AMARILLO_DISTRIBUTION = '0.1' AMARILLO_DISTRIBUTION = '0.3'
TAG = "${AMARILLO_DISTRIBUTION}.${BUILD_NUMBER}${env.BRANCH_NAME == 'main' ? '' : '-dev'}" TAG = "${AMARILLO_DISTRIBUTION}.${BUILD_NUMBER}${env.BRANCH_NAME == 'main' ? '' : '-dev'}"
DEPLOY_WEBHOOK_URL = "${env.BRANCH_NAME == 'main' ? 'http://amarillo.mfdz.de:8888/mitanand' : 'http://amarillo.mfdz.de:8888/dev'}" DEPLOY_WEBHOOK_URL = "${env.BRANCH_NAME == 'main' ? 'http://amarillo.mfdz.de:8888/mitanand' : 'http://amarillo.mfdz.de:8888/dev'}"
DEPLOY_SECRET = credentials('AMARILLO-JENKINS-DEPLOY-SECRET') DEPLOY_SECRET = credentials('AMARILLO-JENKINS-DEPLOY-SECRET')

2
amarillo/static/logging.conf
View file

@ -22,7 +22,7 @@ args=(sys.stdout,)
class=handlers.RotatingFileHandler class=handlers.RotatingFileHandler
level=ERROR level=ERROR
formatter=simpleFormatter formatter=simpleFormatter
args=('error.log', 'a', 1000000, 3) # Filename, mode, maxBytes, backupCount args=('data/error.log', 'a', 1000000, 3) # Filename, mode, maxBytes, backupCount
[formatter_simpleFormatter] [formatter_simpleFormatter]
format=%(asctime)s - %(name)s - %(levelname)s - %(message)s format=%(asctime)s - %(name)s - %(levelname)s - %(message)s

3
standard.Dockerfile
View file

@ -14,3 +14,6 @@ ENV METRICS_PASSWORD=''
RUN --mount=type=secret,id=AMARILLO_REGISTRY_CREDENTIALS \ RUN --mount=type=secret,id=AMARILLO_REGISTRY_CREDENTIALS \
pip install --no-cache-dir --upgrade --extra-index-url https://$(cat /run/secrets/AMARILLO_REGISTRY_CREDENTIALS)@${PACKAGE_REGISTRY_URL} ${PLUGINS} pip install --no-cache-dir --upgrade --extra-index-url https://$(cat /run/secrets/AMARILLO_REGISTRY_CREDENTIALS)@${PACKAGE_REGISTRY_URL} ${PLUGINS}
RUN useradd amarillo
USER amarillo