Skip to content

Commit

Permalink
fix: description and errors
Browse files Browse the repository at this point in the history
Signed-off-by: WoodenMaiden <[email protected]>
  • Loading branch information
WoodenMaiden committed Oct 12, 2023
1 parent 9f8d708 commit 9cbfd7c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/push_to_private.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions agrold-javaweb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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 <[email protected]>" \
"version"=${GIT_COMMIT} \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ public static List<String> 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);
Expand Down

0 comments on commit 9cbfd7c

Please sign in to comment.