Try to specify docker paths

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
opensearch-project · Nov 16, 2022 · ffb6e0c · ffb6e0c
1 parent f19749e
commit ffb6e0c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/actions/start-opensearch-with-one-plugin/action.yml b/.github/actions/start-opensearch-with-one-plugin/action.yml
@@ -66,14 +66,14 @@ runs:
         cat > os-ep.sh <<EOF
         yes | opensearch-plugin install file:///docker-host/${{ inputs.docker-host-plugin-zip }}.zip
         chmod +x setup.sh
-        sh ./setup.sh
+        RUN ./docker-host/setup.sh
         su -c "/opensearch/bin/opensearch" -s /bin/bash opensearch
         chown 1001:1001 -R /opensearch
         EOF
         docker build -t opensearch-test -f- . <<EOF
         FROM ubuntu:latest
         COPY --chown=1001:1001 os-ep.sh /docker-host/
-        COPY --chown=1001:1001 setup.sh /docker-host/setup.sh
+        COPY --chown=1001:1001 ./setup.sh /docker-host/setup.sh
         COPY --chown=1001:1001 ${{ inputs.plugin-name }}.zip /docker-host/${{ inputs.docker-host-plugin-zip }}.zip
         COPY --chown=1001:1001 opensearch* /opensearch/
         RUN chmod +x /docker-host/os-ep.sh

diff --git a/.github/workflows/plugin_install.yml b/.github/workflows/plugin_install.yml
@@ -28,8 +28,8 @@ jobs:
         run: |
           cat > setup.sh <<EOF
           chmod +x ./opensearch/plugins/opensearch-security/tools/install_demo_configuration.sh
-          COPY --chown=1001:1001 ./opensearch/plugins/opensearch-security/tools/install_demo_configuration.sh /docker-host/opensearch/plugins/opensearch-security/tools/install_demo_configuration.sh
-          call echo 'y', 'y', 'N' ^| /docker-host/opensearch/plugins/opensearch-security/tools/install_demo_configuration.sh
+          COPY --chown=1001:1001 ./opensearch/plugins/opensearch-security/tools/install_demo_configuration.sh /docker-host/install_demo_configuration.sh
+          RUN echo 'y', 'y', 'N' ^| ./docker-host/install_demo_configuration.sh
           echo plugins.security.unsupported.restapi.allow_securityconfig_modification: true >> config/opensearch.yml
           EOF