diff --git a/Jenkinsfile b/Jenkinsfile index 6a89a02..31c529a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { OWNER = 'amarillo' BASE_IMAGE_NAME = 'amarillo-base' IMAGE_NAME = 'amarillo' - AMARILLO_DISTRIBUTION = '0.1' + AMARILLO_DISTRIBUTION = '0.3' 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_SECRET = credentials('AMARILLO-JENKINS-DEPLOY-SECRET') diff --git a/amarillo/static/logging.conf b/amarillo/static/logging.conf index 142287a..108e921 100644 --- a/amarillo/static/logging.conf +++ b/amarillo/static/logging.conf @@ -22,7 +22,7 @@ args=(sys.stdout,) class=handlers.RotatingFileHandler level=ERROR 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] format=%(asctime)s - %(name)s - %(levelname)s - %(message)s diff --git a/standard.Dockerfile b/standard.Dockerfile index 3066d0b..a0d2b9b 100644 --- a/standard.Dockerfile +++ b/standard.Dockerfile @@ -14,3 +14,6 @@ ENV METRICS_PASSWORD='' 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} + +RUN useradd amarillo +USER amarillo