From 9cbfd7c6606880290e4ae11cf39a1ea85feb344d Mon Sep 17 00:00:00 2001 From: WoodenMaiden Date: Wed, 11 Oct 2023 12:04:28 +0200 Subject: [PATCH] fix: description and errors Signed-off-by: WoodenMaiden --- .github/workflows/push_to_private.yml | 2 +- agrold-javaweb/Dockerfile | 3 +-- .../src/main/java/agrold/ogust/config/MySQLProperties.java | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/push_to_private.yml b/.github/workflows/push_to_private.yml index 202f9680..0ce4eb8d 100644 --- a/.github/workflows/push_to_private.yml +++ b/.github/workflows/push_to_private.yml @@ -52,7 +52,7 @@ jobs: id: normalize_build_args # the input.build-args is a string line in the form A=a,B=b c,D=d,... we want to convert it to a list of strings run: | - args="$(echo "${{ inputs.build-args }}" | tr ',' '\n'" + args="$(echo '${{ inputs.build-args }}' | tr ',' '\n')" echo "args=$args" >> $GITHUB_OUTPUT echo "host_wo_port=$(echo "${{ inputs.registry_host }}" | cut -d: -f1 )" >> $GITHUB_OUTPUT diff --git a/agrold-javaweb/Dockerfile b/agrold-javaweb/Dockerfile index 06f72ae0..4c271171 100644 --- a/agrold-javaweb/Dockerfile +++ b/agrold-javaweb/Dockerfile @@ -4,7 +4,6 @@ FROM maven:3.9-amazoncorretto-8 as build ARG GIT_COMMIT=unknown ARG AGROLD_NAME=agrold -ARG AGROLD_DESCRIPTION=agrold production instance generated from commit ${GIT_COMMIT} # This is here so we can change it depending of dev/prod ENV AGROLD_NAME=${AGROLD_NAME} @@ -21,9 +20,9 @@ FROM bitnami/tomcat:7 # We renew arguments ARG GIT_COMMIT ARG AGROLD_NAME -ARG AGROLD_DESCRIPTION ARG BUILD_DATE=unknown +ARG AGROLD_DESCRIPTION='"agrold production instance generated from commit ${GIT_COMMIT}"' LABEL "fr.ird.maintainer"="Yann POMIE " \ "version"=${GIT_COMMIT} \ diff --git a/agrold-javaweb/src/main/java/agrold/ogust/config/MySQLProperties.java b/agrold-javaweb/src/main/java/agrold/ogust/config/MySQLProperties.java index 55338fc8..182104f4 100755 --- a/agrold-javaweb/src/main/java/agrold/ogust/config/MySQLProperties.java +++ b/agrold-javaweb/src/main/java/agrold/ogust/config/MySQLProperties.java @@ -43,9 +43,9 @@ public static List readLoginConfigurations() { String usr = System.getProperty("agrold.db_username"); String pwd = System.getProperty("agrold.db_password"); - if (URL == null) throw new NullPointerException("Missing env Variable: AGROLD_DB_CONNECTION_URL"); - if (usr == null) throw new NullPointerException("Missing env Variable: AGROLD_DB_USERNAME"); - if (pwd == null) throw new NullPointerException("Missing env Variable: AGROLD_DB_PASSWORD"); + if (URL == null) throw new NullPointerException("Missing system property: agrold.db_connection_url"); + if (usr == null) throw new NullPointerException("Missing system property: agrold.db_username"); + if (pwd == null) throw new NullPointerException("Missing system property: agrold.db_password"); lines.add(URL); lines.add(usr);