Merge pull request #1376 from chainguard-dev/use-contextdir

chainguard-dev · Jul 13, 2024 · 2f1e784 · 2f1e784
2 parents 875765e + d69c7fd
commit 2f1e784
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/pkg/build/pipelines/npm/install.yaml b/pkg/build/pipelines/npm/install.yaml
@@ -19,7 +19,7 @@ inputs:
   prefix:
     description: |
       The -prefix argument to pass to npm install; where /bin and /lib will be copied to.
-    default: "${{targets.destdir}}/usr/"
+    default: "${{targets.contextdir}}/usr/"
 
   overrides:
     description: |

diff --git a/pkg/build/pipelines/pecl/install.yaml b/pkg/build/pipelines/pecl/install.yaml
@@ -12,6 +12,6 @@ inputs:
 
 pipeline:
   - runs: |
-      make INSTALL_ROOT="${{targets.destdir}}" install
-      install -d ${{targets.destdir}}/etc/php/conf.d
-      echo "extension=${{inputs.extension}}.so" > ${{targets.destdir}}/etc/php/conf.d/${{inputs.extension}}.ini
+      make INSTALL_ROOT="${{targets.contextdir}}" install
+      install -d ${{targets.contextdir}}/etc/php/conf.d
+      echo "extension=${{inputs.extension}}.so" > ${{targets.contextdir}}/etc/php/conf.d/${{inputs.extension}}.ini
diff --git a/pkg/build/pipelines/perl/cleanup.yaml b/pkg/build/pipelines/perl/cleanup.yaml
@@ -6,4 +6,4 @@ needs:
 
 pipeline:
   - runs: |
-      find "${{targets.destdir}}" \( -name perllocal.pod -o -name .packlist \) -delete
+      find "${{targets.contextdir}}" \( -name perllocal.pod -o -name .packlist \) -delete
diff --git a/pkg/build/pipelines/ruby/clean.yaml b/pkg/build/pipelines/ruby/clean.yaml
@@ -12,6 +12,6 @@ pipeline:
         exit 1
       fi
   - runs: |
-      INSTALL_DIR=${{targets.destdir}}/$(ruby -e 'puts Gem.default_dir')
+      INSTALL_DIR=${{targets.contextdir}}/$(ruby -e 'puts Gem.default_dir')
       rm -rf ${INSTALL_DIR}/build_info \
              ${INSTALL_DIR}/cache