Skip to content

Commit 74a6be3

Browse files
YOU54FYOU54F
committed
feat: use sh for wrapper scripts
1 parent 22f549d commit 74a6be3

13 files changed

+42
-42
lines changed

‎.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
test:
2929
defaults:
3030
run:
31-
shell: bash
31+
shell: sh
3232
needs: [build]
3333
strategy:
3434
fail-fast: false

‎Dockerfile.alpine.arm64

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ FROM arm64v8/alpine
33
WORKDIR ../
44

55
ARG TARGET_ARCH
6-
ARG PACT_VERSION
6+
ARG PACT_CLI_VERSION
77
ARG TARGET_ARCH=${TARGET_ARCH:-arm64}
8-
ARG PACT_VERSION=${PACT_VERSION:-2.0.1}
8+
ARG PACT_CLI_VERSION=${PACT_CLI_VERSION:-2.0.1}
99

10-
RUN apk --no-cache add gcompat libc6-compat bash
10+
RUN apk --no-cache add gcompat libc6-compat
1111

12-
RUN wget -q https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v${PACT_VERSION}/pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
13-
&& tar xzf pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
14-
&& rm -rf pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
12+
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 \
13+
&& tar xzf pact-${PACT_CLI_VERSION}-linux-${TARGET_ARCH}.tar.gz \
14+
&& rm -rf pact-${PACT_CLI_VERSION}-linux-${TARGET_ARCH}.tar.gz \
1515
&& ln -s /pact/bin/* /usr/local/bin
1616

1717
ENTRYPOINT ["pact-mock-service"]

‎Dockerfile.alpine.x64

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ FROM alpine:latest
33
WORKDIR ../
44

55
ARG TARGET_ARCH
6-
ARG PACT_VERSION
6+
ARG PACT_CLI_VERSION
77
ARG TARGET_ARCH=${TARGET_ARCH:-arm64}
8-
ARG PACT_VERSION=${PACT_VERSION:-2.0.1}
8+
ARG PACT_CLI_VERSION=${PACT_CLI_VERSION:-2.0.1}
99

10-
RUN apk --no-cache add gcompat libc6-compat bash
11-
RUN wget -q https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v${PACT_VERSION}/pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
12-
&& tar xzf pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
13-
&& rm -rf pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
10+
RUN apk --no-cache add gcompat libc6-compat
11+
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 \
12+
&& tar xzf pact-${PACT_CLI_VERSION}-linux-${TARGET_ARCH}.tar.gz \
13+
&& rm -rf pact-${PACT_CLI_VERSION}-linux-${TARGET_ARCH}.tar.gz \
1414
&& ln -s /pact/bin/* /usr/local/bin
1515

1616
ENTRYPOINT ["pact-mock-service"]

‎Dockerfile.debian.slim

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ FROM debian:11-slim
33
WORKDIR ../
44

55
ARG TARGET_ARCH
6-
ARG PACT_VERSION
6+
ARG PACT_CLI_VERSION
77
ARG TARGET_ARCH=${TARGET_ARCH:-arm64}
8-
ARG PACT_VERSION=${PACT_VERSION:-2.0.1}
8+
ARG PACT_CLI_VERSION=${PACT_CLI_VERSION:-2.0.1}
99

1010
RUN apt update --yes && apt install wget --yes
11-
RUN wget -q https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v${PACT_VERSION}/pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
12-
&& tar xzf pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
13-
&& rm -rf pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
11+
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 \
12+
&& tar xzf pact-${PACT_CLI_VERSION}-linux-${TARGET_ARCH}.tar.gz \
13+
&& rm -rf pact-${PACT_CLI_VERSION}-linux-${TARGET_ARCH}.tar.gz \
1414
&& ln -s /pact/bin/* /usr/local/bin
1515

1616
ENTRYPOINT ["pact-mock-service"]

‎Dockerfile.ubuntu

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ FROM ubuntu:latest
33
WORKDIR ../
44

55
ARG TARGET_ARCH
6-
ARG PACT_VERSION
6+
ARG PACT_CLI_VERSION
77
ARG TARGET_ARCH=${TARGET_ARCH:-arm64}
8-
ARG PACT_VERSION=${PACT_VERSION:-2.0.1}
8+
ARG PACT_CLI_VERSION=${PACT_CLI_VERSION:-2.0.1}
99

1010
RUN apt update --yes && apt install wget --yes
11-
RUN wget -q https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v${PACT_VERSION}/pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
12-
&& tar xzf pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
13-
&& rm -rf pact-${PACT_VERSION}-linux-${TARGET_ARCH}.tar.gz \
11+
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 \
12+
&& tar xzf pact-${PACT_CLI_VERSION}-linux-${TARGET_ARCH}.tar.gz \
13+
&& rm -rf pact-${PACT_CLI_VERSION}-linux-${TARGET_ARCH}.tar.gz \
1414
&& ln -s /pact/bin/* /usr/local/bin
1515

1616
ENTRYPOINT ["pact-mock-service"]

‎packaging/pact-broker.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/bin/sh
22
set -e
33

44
SOURCE="$0"
@@ -16,7 +16,7 @@ RDIR="$( dirname "$SOURCE" )"
1616
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
1717

1818
# Figure out where this script is located.
19-
LIBDIR="`cd \"$DIR\" && cd ../lib && pwd`"
19+
LIBDIR="$(cd "$DIR" && cd ../lib && pwd)"
2020

2121
# Tell Bundler where the Gemfile and gems are.
2222
export BUNDLE_GEMFILE="$LIBDIR/vendor/Gemfile"
@@ -26,4 +26,4 @@ unset BUNDLE_APP_CONFIG
2626
export BUNDLE_FROZEN=1
2727

2828
# Run the actual app using the bundled Ruby interpreter, with Bundler activated.
29-
exec "$LIBDIR/ruby/bin/ruby" -E UTF-8 -rreadline -rbundler/setup -I "$LIBDIR/app/lib" "$LIBDIR/app/pact-broker.rb" "$@"
29+
exec "$LIBDIR/ruby/bin/ruby" -E UTF-8 -rreadline -rbundler/setup -I "$LIBDIR/app/lib" "$LIBDIR/app/pact-broker.rb" "$@"

‎packaging/pact-message.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/bin/sh
22
set -e
33

44
SOURCE="$0"
@@ -16,7 +16,7 @@ RDIR="$( dirname "$SOURCE" )"
1616
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
1717

1818
# Figure out where this script is located.
19-
LIBDIR="`cd \"$DIR\" && cd ../lib && pwd`"
19+
LIBDIR="$(cd "$DIR" && cd ../lib && pwd)"
2020

2121
# Tell Bundler where the Gemfile and gems are.
2222
export BUNDLE_GEMFILE="$LIBDIR/vendor/Gemfile"

‎packaging/pact-mock-service.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/bin/sh
22
set -e
33

44
SOURCE="$0"
@@ -16,7 +16,7 @@ RDIR="$( dirname "$SOURCE" )"
1616
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
1717

1818
# Figure out where this script is located.
19-
LIBDIR="`cd \"$DIR\" && cd ../lib && pwd`"
19+
LIBDIR="$(cd "$DIR" && cd ../lib && pwd)"
2020

2121
# Tell Bundler where the Gemfile and gems are.
2222
export BUNDLE_GEMFILE="$LIBDIR/vendor/Gemfile"

‎packaging/pact-provider-verifier.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#!/bin/bash
1+
#!/bin/sh
22
set -e
33

4-
SOURCE="${BASH_SOURCE[0]}"
4+
SOURCE="$0"
55
while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
66
TARGET="$(readlink "$SOURCE")"
77
START="$( echo "$TARGET" | cut -c 1 )"
@@ -16,7 +16,7 @@ RDIR="$( dirname "$SOURCE" )"
1616
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
1717

1818
# Figure out where this script is located.
19-
LIBDIR="`cd \"$DIR\" && cd ../lib && pwd`"
19+
LIBDIR="$(cd "$DIR" && cd ../lib && pwd)"
2020

2121
# Tell Bundler where the Gemfile and gems are.
2222
export BUNDLE_GEMFILE="$LIBDIR/vendor/Gemfile"

‎packaging/pact-publish.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#!/bin/bash
1+
#!/bin/sh
22
set -e
33

4-
SOURCE="${BASH_SOURCE[0]}"
4+
SOURCE="$0"
55
while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
66
TARGET="$(readlink "$SOURCE")"
77
START="$( echo "$TARGET" | cut -c 1 )"
@@ -16,7 +16,7 @@ RDIR="$( dirname "$SOURCE" )"
1616
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
1717

1818
# Figure out where this script is located.
19-
LIBDIR="`cd \"$DIR\" && cd ../lib && pwd`"
19+
LIBDIR="$(cd "$DIR" && cd ../lib && pwd)"
2020

2121
# Tell Bundler where the Gemfile and gems are.
2222
export BUNDLE_GEMFILE="$LIBDIR/vendor/Gemfile"

‎packaging/pact-stub-service.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/bin/sh
22
set -e
33

44
SOURCE="$0"
@@ -16,7 +16,7 @@ RDIR="$( dirname "$SOURCE" )"
1616
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
1717

1818
# Figure out where this script is located.
19-
LIBDIR="`cd \"$DIR\" && cd ../lib && pwd`"
19+
LIBDIR="$(cd "$DIR" && cd ../lib && pwd)"
2020

2121
# Tell Bundler where the Gemfile and gems are.
2222
export BUNDLE_GEMFILE="$LIBDIR/vendor/Gemfile"

‎packaging/pact.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/bin/sh
22
set -e
33

44
SOURCE="$0"
@@ -16,7 +16,7 @@ RDIR="$( dirname "$SOURCE" )"
1616
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
1717

1818
# Figure out where this script is located.
19-
LIBDIR="`cd \"$DIR\" && cd ../lib && pwd`"
19+
LIBDIR="$(cd "$DIR" && cd ../lib && pwd)"
2020

2121
# Tell Bundler where the Gemfile and gems are.
2222
export BUNDLE_GEMFILE="$LIBDIR/vendor/Gemfile"

‎packaging/pactflow.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/bin/sh
22
set -e
33

44
SOURCE="$0"
@@ -16,7 +16,7 @@ RDIR="$( dirname "$SOURCE" )"
1616
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
1717

1818
# Figure out where this script is located.
19-
LIBDIR="`cd \"$DIR\" && cd ../lib && pwd`"
19+
LIBDIR="$(cd "$DIR" && cd ../lib && pwd)"
2020

2121
# Tell Bundler where the Gemfile and gems are.
2222
export BUNDLE_GEMFILE="$LIBDIR/vendor/Gemfile"

0 commit comments

Comments
 (0)