From 43aa0dbb8e6d3f59910343337ffc0bf93362ef6a Mon Sep 17 00:00:00 2001 From: Lacey Sanderson Date: Mon, 25 Mar 2024 09:12:04 -0600 Subject: [PATCH 1/2] Switch name of Tripal dockerfile. --- action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/action.yml b/action.yml index e7b7c5f..55be941 100644 --- a/action.yml +++ b/action.yml @@ -48,7 +48,7 @@ runs: if: ${{ inputs.build-image == 'true' }} shell: bash run: | - TRIPALDOCKER="tripaldocker/Dockerfile-php${{ inputs.php-version }}-pgsql${{ inputs.pgsql-version }}" + TRIPALDOCKER="tripaldocker/Dockerfile-php${{ inputs.php-version }}" if [ -f "${{ inputs.dockerfile }}" ]; then docker build --tag=testing:localdocker \ --build-arg drupalversion="${{ inputs.drupal-version }}" \ @@ -57,6 +57,7 @@ runs: elif [ -f "$TRIPALDOCKER" ]; then docker build --tag=testing:localdocker \ --build-arg drupalversion="${{ inputs.drupal-version }}" \ + --build-arg postgresqlversion="${{ inputs.pgsql-version }}"" --build-arg chadoschema='teacup' ./ \ --file $TRIPALDOCKER fi From 579b1367242c28434a5a070e48ba5e49b64a258a Mon Sep 17 00:00:00 2001 From: Lacey Sanderson Date: Mon, 25 Mar 2024 09:18:59 -0600 Subject: [PATCH 2/2] Syntax error fix. --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 55be941..bebda72 100644 --- a/action.yml +++ b/action.yml @@ -57,7 +57,7 @@ runs: elif [ -f "$TRIPALDOCKER" ]; then docker build --tag=testing:localdocker \ --build-arg drupalversion="${{ inputs.drupal-version }}" \ - --build-arg postgresqlversion="${{ inputs.pgsql-version }}"" + --build-arg postgresqlversion="${{ inputs.pgsql-version }}" \ --build-arg chadoschema='teacup' ./ \ --file $TRIPALDOCKER fi