Skip to content

Commit 95fd8ae

Browse files
committed
Test
1 parent 4ecad57 commit 95fd8ae

File tree

2 files changed

+26
-28
lines changed

2 files changed

+26
-28
lines changed

Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:20-slim
1+
FROM node:18-slim
22

33
LABEL version="1.0.0"
44
LABEL repository="http://github.com/Github-Actions-Community/merge-release"
@@ -12,14 +12,12 @@ LABEL com.github.actions.color="red"
1212

1313
RUN apt-get -y update && \
1414
apt-get -y --no-install-recommends install git jq findutils curl ca-certificates && \
15-
rm -rf /var/lib/apt/lists/* && \
16-
npm update -g npm
15+
rm -rf /var/lib/apt/lists/*
1716

18-
WORKDIR /usr/app
19-
COPY ./ ./
17+
COPY . .
2018

2119
# Install dependencies here
2220
RUN npm ci --omit dev
2321

24-
ENTRYPOINT ["/usr/app/entrypoint.sh"]
22+
ENTRYPOINT ["/entrypoint.sh"]
2523
CMD ["help"]

entrypoint.sh

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
set -e
44

55
# Map the inputs over to the environment variables to support both `env` and `with` methods for backwards-compatibility
6-
export DEBUG=${INPUT_DEBUG:-"$DEBUG"}
7-
export DEPLOY_DIR=${INPUT_DEPLOY_DIR:-"$DEPLOY_DIR"}
8-
export DISABLE_GIT_TAG=${INPUT_DISABLE_GIT_TAG:-"$DISABLE_GIT_TAG"}
9-
export GIT_TAG_SUFFIX=${INPUT_GIT_TAG_SUFFIX:-"$GIT_TAG_SUFFIX"}
10-
export GITHUB_ACTOR=${INPUT_GITHUB_ACTOR:-"$GITHUB_ACTOR"}
11-
export GITHUB_REPOSITORY=${INPUT_GITHUB_REPOSITORY:-"$GITHUB_REPOSITORY"}
12-
export GITHUB_TOKEN=${INPUT_GITHUB_TOKEN:-"$GITHUB_TOKEN"}
13-
export MAJOR_TAGS=${INPUT_MAJOR_TAGS:-"$MAJOR_TAGS"}
14-
export MINOR_TAGS=${INPUT_MINOR_TAGS:-"$MINOR_TAGS"}
15-
export NPM_AUTH_TOKEN=${INPUT_NPM_AUTH_TOKEN:-"$NPM_AUTH_TOKEN"}
16-
export NPM_CONFIG_USERCONFIG=${INPUT_NPM_CONFIG_USERCONFIG:-"$NPM_CONFIG_USERCONFIG"}
17-
export NPM_CUSTOM_NPMRC=${INPUT_NPM_CUSTOM_NPMRC:-"$NPM_CUSTOM_NPMRC"}
18-
export NPM_PRIVATE=${INPUT_NPM_PRIVATE:-"$NPM_PRIVATE"}
19-
export NPM_REGISTRY_URL=${INPUT_NPM_REGISTRY_URL:-"$NPM_REGISTRY_URL"}
20-
export SRC_PACKAGE_DIR=${INPUT_SRC_PACKAGE_DIR:-"$SRC_PACKAGE_DIR"}
6+
export DEBUG="${INPUT_DEBUG:-"$DEBUG"}"
7+
export DEPLOY_DIR="${INPUT_DEPLOY_DIR:-"$DEPLOY_DIR"}"
8+
export DISABLE_GIT_TAG="${INPUT_DISABLE_GIT_TAG:-"$DISABLE_GIT_TAG"}"
9+
export GIT_TAG_SUFFIX="${INPUT_GIT_TAG_SUFFIX:-"$GIT_TAG_SUFFIX"}"
10+
export GITHUB_ACTOR="${INPUT_GITHUB_ACTOR:-"$GITHUB_ACTOR"}"
11+
export GITHUB_REPOSITORY="${INPUT_GITHUB_REPOSITORY:-"$GITHUB_REPOSITORY"}"
12+
export GITHUB_TOKEN="${INPUT_GITHUB_TOKEN:-"$GITHUB_TOKEN"}"
13+
export MAJOR_TAGS="${INPUT_MAJOR_TAGS:-"$MAJOR_TAGS"}"
14+
export MINOR_TAGS="${INPUT_MINOR_TAGS:-"$MINOR_TAGS"}"
15+
export NPM_AUTH_TOKEN="${INPUT_NPM_AUTH_TOKEN:-"$NPM_AUTH_TOKEN"}"
16+
export NPM_CONFIG_USERCONFIG="${INPUT_NPM_CONFIG_USERCONFIG:-"$NPM_CONFIG_USERCONFIG"}"
17+
export NPM_CUSTOM_NPMRC="${INPUT_NPM_CUSTOM_NPMRC:-"$NPM_CUSTOM_NPMRC"}"
18+
export NPM_PRIVATE="${INPUT_NPM_PRIVATE:-"$NPM_PRIVATE"}"
19+
export NPM_REGISTRY_URL="${INPUT_NPM_REGISTRY_URL:-"$NPM_REGISTRY_URL"}"
20+
export SRC_PACKAGE_DIR="${INPUT_SRC_PACKAGE_DIR:-"$SRC_PACKAGE_DIR"}"
2121

2222
# Set default values
2323
NPM_STRICT_SSL="${NPM_STRICT_SSL-true}"
@@ -26,10 +26,10 @@ if ! $NPM_STRICT_SSL; then
2626
NPM_REGISTRY_SCHEME="http"
2727
fi
2828
NPM_REGISTRY_URL="${NPM_REGISTRY_SCHEME}://"$(echo "${NPM_REGISTRY_URL:-registry.npmjs.org}" | sed -r 's/https?:\/\///')
29-
MINOR_TAGS=${MINOR_TAGS:-"feat"}
30-
DEPLOY_DIR=${DEPLOY_DIR:-"."}
31-
SRC_PACKAGE_DIR=${SRC_PACKAGE_DIR:-"."}
32-
NPM_CONFIG_USERCONFIG=${NPM_CONFIG_USERCONFIG:-"$HOME/.npmrc"}
29+
MINOR_TAGS="${MINOR_TAGS:-"feat"}"
30+
DEPLOY_DIR="${DEPLOY_DIR:-"."}"
31+
SRC_PACKAGE_DIR="${SRC_PACKAGE_DIR:-"."}"
32+
NPM_CONFIG_USERCONFIG="${NPM_CONFIG_USERCONFIG:-"$HOME/.npmrc"}"
3333

3434
if [ "$DEBUG" = "true" ]; then
3535
echo "Debug Enabled, Printing Environment:"
@@ -40,13 +40,13 @@ fi
4040
if [ -n "$NPM_CUSTOM_NPMRC" ]; then
4141
# Use a fully-formed npmrc file if provided
4242
echo "$NPM_CUSTOM_NPMRC" > "$NPM_CONFIG_USERCONFIG"
43+
chmod 0600 "$NPM_CONFIG_USERCONFIG"
4344
elif [ -n "$NPM_AUTH_TOKEN" ]; then
4445
# Allow registry.npmjs.org to be overridden with an environment variable
4546
printf "//%s/:_authToken=%s\\nregistry=%s\\nstrict-ssl=%s" "$NPM_REGISTRY_URL" "$NPM_AUTH_TOKEN" "$NPM_REGISTRY_URL" "${NPM_STRICT_SSL}" > "$NPM_CONFIG_USERCONFIG"
47+
chmod 0600 "$NPM_CONFIG_USERCONFIG"
4648
fi
4749

48-
chmod 0600 "$NPM_CONFIG_USERCONFIG"
49-
5050
if [ "$DEBUG" = "true" ]; then
5151
echo "Debug Enabled, Printing '$NPM_CONFIG_USERCONFIG' file contents:"
5252
cat "$NPM_CONFIG_USERCONFIG"
@@ -65,4 +65,4 @@ git show-ref # useful for debugging
6565
git branch --verbose
6666

6767
# Dependencies are installed at build time
68-
node /usr/app/src/merge-release-run.js "$@" || exit 1
68+
node /src/merge-release-run.js "$@" || exit 1

0 commit comments

Comments
 (0)