Merge pull request #115 from pact-foundation/feat/use_sh_wrappers

Feat/use sh wrappers
pact-foundation · Feb 8, 2024 · d9faf54 · d9faf54
2 parents 217815b + 1f03a9e
commit d9faf54
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 43 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,12 +28,13 @@ jobs:
   test:
     defaults:
       run:
-        shell: bash
+        shell: ${{ matrix.shell }}
     needs: [build]
     strategy:
       fail-fast: false
       matrix:
         os: ["windows-latest","ubuntu-latest","macos-latest"]
+        shell: ["sh","bash"]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -46,4 +47,4 @@ jobs:
       run: ./script/unpack-and-test.sh
       env: 
         BINARY_OS: 'windows'
-        BINARY_ARCH: 'x86'
+        BINARY_ARCH: 'x86'
diff --git a/Dockerfile.alpine.arm64 b/Dockerfile.alpine.arm64
@@ -3,15 +3,15 @@ FROM arm64v8/alpine
 WORKDIR ../
 
 ARG TARGET_ARCH
-ARG PACT_VERSION
+ARG PACT_CLI_VERSION
 ARG TARGET_ARCH=${TARGET_ARCH:-arm64}
-ARG PACT_VERSION=${PACT_VERSION:-2.0.1}
+ARG PACT_CLI_VERSION=${PACT_CLI_VERSION:-2.0.1}
 
-RUN apk --no-cache add gcompat libc6-compat bash
+RUN apk --no-cache add gcompat libc6-compat
 
-RUN wget -q https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v${PACT_VERSION}/pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
-     && tar xzf pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
-     && rm -rf pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
+RUN wget -q https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v${PACT_CLI_VERSION}/pact-${PACT_CLI_VERSION}-linux-${TARGET_ARCH}.tar.gz \
+     && tar xzf pact-${PACT_CLI_VERSION}-linux-${TARGET_ARCH}.tar.gz \
+     && rm -rf pact-${PACT_CLI_VERSION}-linux-${TARGET_ARCH}.tar.gz \
      && ln -s /pact/bin/* /usr/local/bin
 
 ENTRYPOINT ["pact-mock-service"]
diff --git a/Dockerfile.alpine.x64 b/Dockerfile.alpine.x64
@@ -3,14 +3,14 @@ FROM alpine:latest
 WORKDIR ../
 
 ARG TARGET_ARCH
-ARG PACT_VERSION
+ARG PACT_CLI_VERSION
 ARG TARGET_ARCH=${TARGET_ARCH:-arm64}
-ARG PACT_VERSION=${PACT_VERSION:-2.0.1}
+ARG PACT_CLI_VERSION=${PACT_CLI_VERSION:-2.0.1}
 
-RUN apk --no-cache add gcompat libc6-compat bash
-RUN wget -q https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v${PACT_VERSION}/pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
-     && tar xzf pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
-     && rm -rf pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
+RUN apk --no-cache add gcompat libc6-compat
+RUN wget -q https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v${PACT_CLI_VERSION}/pact-${PACT_CLI_VERSION}-linux-${TARGET_ARCH}.tar.gz \
+     && tar xzf pact-${PACT_CLI_VERSION}-linux-${TARGET_ARCH}.tar.gz \
+     && rm -rf pact-${PACT_CLI_VERSION}-linux-${TARGET_ARCH}.tar.gz \
      && ln -s /pact/bin/* /usr/local/bin
 
 ENTRYPOINT ["pact-mock-service"]
diff --git a/Dockerfile.debian.slim b/Dockerfile.debian.slim
@@ -3,14 +3,14 @@ FROM debian:11-slim
 WORKDIR ../
 
 ARG TARGET_ARCH
-ARG PACT_VERSION
+ARG PACT_CLI_VERSION
 ARG TARGET_ARCH=${TARGET_ARCH:-arm64}
-ARG PACT_VERSION=${PACT_VERSION:-2.0.1}
+ARG PACT_CLI_VERSION=${PACT_CLI_VERSION:-2.0.1}
 
 RUN apt update --yes && apt install wget --yes
-RUN wget -q https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v${PACT_VERSION}/pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
-     && tar xzf pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
-     && rm -rf pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
+RUN wget -q https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v${PACT_CLI_VERSION}/pact-${PACT_CLI_VERSION}-linux-${TARGET_ARCH}.tar.gz \
+     && tar xzf pact-${PACT_CLI_VERSION}-linux-${TARGET_ARCH}.tar.gz \
+     && rm -rf pact-${PACT_CLI_VERSION}-linux-${TARGET_ARCH}.tar.gz \
      && ln -s /pact/bin/* /usr/local/bin
 
 ENTRYPOINT ["pact-mock-service"]
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
@@ -3,14 +3,14 @@ FROM ubuntu:latest
 WORKDIR ../
 
 ARG TARGET_ARCH
-ARG PACT_VERSION
+ARG PACT_CLI_VERSION
 ARG TARGET_ARCH=${TARGET_ARCH:-arm64}
-ARG PACT_VERSION=${PACT_VERSION:-2.0.1}
+ARG PACT_CLI_VERSION=${PACT_CLI_VERSION:-2.0.1}
 
 RUN apt update --yes && apt install wget --yes
-RUN wget -q https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v${PACT_VERSION}/pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
-     && tar xzf pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
-     && rm -rf pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
+RUN wget -q https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v${PACT_CLI_VERSION}/pact-${PACT_CLI_VERSION}-linux-${TARGET_ARCH}.tar.gz \
+     && tar xzf pact-${PACT_CLI_VERSION}-linux-${TARGET_ARCH}.tar.gz \
+     && rm -rf pact-${PACT_CLI_VERSION}-linux-${TARGET_ARCH}.tar.gz \
      && ln -s /pact/bin/* /usr/local/bin
 
 ENTRYPOINT ["pact-mock-service"]
diff --git a/packaging/pact-broker.sh b/packaging/pact-broker.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
 SOURCE="$0"
@@ -16,7 +16,7 @@ RDIR="$( dirname "$SOURCE" )"
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 # Figure out where this script is located.
-LIBDIR="`cd \"$DIR\" && cd ../lib && pwd`"
+LIBDIR="$(cd "$DIR" && cd ../lib && pwd)"
 
 # Tell Bundler where the Gemfile and gems are.
 export BUNDLE_GEMFILE="$LIBDIR/vendor/Gemfile"
@@ -26,4 +26,4 @@ unset BUNDLE_APP_CONFIG
 export BUNDLE_FROZEN=1
 
 # Run the actual app using the bundled Ruby interpreter, with Bundler activated.
-exec "$LIBDIR/ruby/bin/ruby" -E UTF-8 -rreadline -rbundler/setup -I "$LIBDIR/app/lib" "$LIBDIR/app/pact-broker.rb" "$@"
+exec "$LIBDIR/ruby/bin/ruby" -E UTF-8 -rreadline -rbundler/setup -I "$LIBDIR/app/lib" "$LIBDIR/app/pact-broker.rb" "$@"
diff --git a/packaging/pact-message.sh b/packaging/pact-message.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
 SOURCE="$0"
@@ -16,7 +16,7 @@ RDIR="$( dirname "$SOURCE" )"
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 # Figure out where this script is located.
-LIBDIR="`cd \"$DIR\" && cd ../lib && pwd`"
+LIBDIR="$(cd "$DIR" && cd ../lib && pwd)"
 
 # Tell Bundler where the Gemfile and gems are.
 export BUNDLE_GEMFILE="$LIBDIR/vendor/Gemfile"

diff --git a/packaging/pact-mock-service.sh b/packaging/pact-mock-service.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
 SOURCE="$0"
@@ -16,7 +16,7 @@ RDIR="$( dirname "$SOURCE" )"
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 # Figure out where this script is located.
-LIBDIR="`cd \"$DIR\" && cd ../lib && pwd`"
+LIBDIR="$(cd "$DIR" && cd ../lib && pwd)"
 
 # Tell Bundler where the Gemfile and gems are.
 export BUNDLE_GEMFILE="$LIBDIR/vendor/Gemfile"

diff --git a/packaging/pact-provider-verifier.sh b/packaging/pact-provider-verifier.sh
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
-SOURCE="${BASH_SOURCE[0]}"
+SOURCE="$0"
 while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
   TARGET="$(readlink "$SOURCE")"
   START="$( echo "$TARGET" | cut -c 1 )"
@@ -16,7 +16,7 @@ RDIR="$( dirname "$SOURCE" )"
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 # Figure out where this script is located.
-LIBDIR="`cd \"$DIR\" && cd ../lib && pwd`"
+LIBDIR="$(cd "$DIR" && cd ../lib && pwd)"
 
 # Tell Bundler where the Gemfile and gems are.
 export BUNDLE_GEMFILE="$LIBDIR/vendor/Gemfile"

diff --git a/packaging/pact-publish.sh b/packaging/pact-publish.sh
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
-SOURCE="${BASH_SOURCE[0]}"
+SOURCE="$0"
 while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
   TARGET="$(readlink "$SOURCE")"
   START="$( echo "$TARGET" | cut -c 1 )"
@@ -16,7 +16,7 @@ RDIR="$( dirname "$SOURCE" )"
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 # Figure out where this script is located.
-LIBDIR="`cd \"$DIR\" && cd ../lib && pwd`"
+LIBDIR="$(cd "$DIR" && cd ../lib && pwd)"
 
 # Tell Bundler where the Gemfile and gems are.
 export BUNDLE_GEMFILE="$LIBDIR/vendor/Gemfile"

diff --git a/packaging/pact-stub-service.sh b/packaging/pact-stub-service.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
 SOURCE="$0"
@@ -16,7 +16,7 @@ RDIR="$( dirname "$SOURCE" )"
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 # Figure out where this script is located.
-LIBDIR="`cd \"$DIR\" && cd ../lib && pwd`"
+LIBDIR="$(cd "$DIR" && cd ../lib && pwd)"
 
 # Tell Bundler where the Gemfile and gems are.
 export BUNDLE_GEMFILE="$LIBDIR/vendor/Gemfile"

diff --git a/packaging/pact.sh b/packaging/pact.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
 SOURCE="$0"
@@ -16,7 +16,7 @@ RDIR="$( dirname "$SOURCE" )"
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 # Figure out where this script is located.
-LIBDIR="`cd \"$DIR\" && cd ../lib && pwd`"
+LIBDIR="$(cd "$DIR" && cd ../lib && pwd)"
 
 # Tell Bundler where the Gemfile and gems are.
 export BUNDLE_GEMFILE="$LIBDIR/vendor/Gemfile"

diff --git a/packaging/pactflow.sh b/packaging/pactflow.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
 SOURCE="$0"
@@ -16,7 +16,7 @@ RDIR="$( dirname "$SOURCE" )"
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 # Figure out where this script is located.
-LIBDIR="`cd \"$DIR\" && cd ../lib && pwd`"
+LIBDIR="$(cd "$DIR" && cd ../lib && pwd)"
 
 # Tell Bundler where the Gemfile and gems are.
 export BUNDLE_GEMFILE="$LIBDIR/vendor/Gemfile"