From 4baa844a73ed2162e3b2a96a942196eec130ff03 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Sat, 31 Aug 2019 23:16:43 +0200 Subject: [PATCH] Fix entrypoint --- Dockerfile | 5 ++- entrypoint.sh | 84 +++++++++++++++++++++++++-------------------------- 2 files changed, 44 insertions(+), 45 deletions(-) diff --git a/Dockerfile b/Dockerfile index 597a67c..b02e927 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,6 @@ LABEL version="0.1.0" \ "com.github.actions.icon"="package" \ "com.github.actions.color"="green" -COPY entrypoint.sh LICENSE README.md / -RUN chmod a+x /entrypoint.sh - +COPY LICENSE README.md / +ADD entrypoint.sh / ENTRYPOINT [ "/entrypoint.sh" ] diff --git a/entrypoint.sh b/entrypoint.sh index 8c2e234..d1866cc 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,42 +1,42 @@ -#!/bin/sh -set -e - -BUILD_DIR=$1 -if [ ! -d "$BUILD_DIR" ]; then - echo "⛔️ Build dir does not exist" - exit 1 -fi -echo "cd $BUILD_DIR" -cd "$BUILD_DIR" - -REPO="https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git" -OWNER="$(echo $GITHUB_REPOSITORY | cut -d'/' -f 1)" -REPONAME="$(echo $GITHUB_REPOSITORY | cut -d'/' -f 2)" -PAGES_REPO="${OWNER}.github.io" - -if [[ "$REPONAME" == "$PAGES_REPO" ]]; then - TARGET_BRANCH="master" -else - TARGET_BRANCH="gh-pages" -fi - -: "${REMOTE_BRANCH:=$TARGET_BRANCH}" - -git init -git config user.name "${GITHUB_ACTOR}" -git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" - -if [ -z "$(git status --porcelain)" ]; then - echo "⚠️ Nothing to publish" - exit 0 -fi - -git remote rm origin || true -git remote add origin "${REPO}" -git add . -git commit --allow-empty -m 'Deploy to GitHub pages' -git push --force --quiet "$REPO" $REMOTE_BRANCH -rm -rf .git - -cd "$GITHUB_WORKSPACE" -echo "🎉 Content of $BUILD_DIR has been deployed to GitHub Pages." +#!/bin/sh +set -e + +BUILD_DIR=$1 +if [ ! -d "$BUILD_DIR" ]; then + echo "⛔️ Build dir does not exist" + exit 1 +fi +echo "cd $BUILD_DIR" +cd "$BUILD_DIR" + +REPO="https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git" +OWNER="$(echo $GITHUB_REPOSITORY | cut -d'/' -f 1)" +REPONAME="$(echo $GITHUB_REPOSITORY | cut -d'/' -f 2)" +PAGES_REPO="${OWNER}.github.io" + +if [[ "$REPONAME" == "$PAGES_REPO" ]]; then + TARGET_BRANCH="master" +else + TARGET_BRANCH="gh-pages" +fi + +: "${REMOTE_BRANCH:=$TARGET_BRANCH}" + +git init +git config user.name "${GITHUB_ACTOR}" +git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" + +if [ -z "$(git status --porcelain)" ]; then + echo "⚠️ Nothing to publish" + exit 0 +fi + +git remote rm origin || true +git remote add origin "${REPO}" +git add . +git commit --allow-empty -m 'Deploy to GitHub pages' +git push --force --quiet "$REPO" $REMOTE_BRANCH +rm -rf .git + +cd "$GITHUB_WORKSPACE" +echo "🎉 Content of $BUILD_DIR has been deployed to GitHub Pages."