Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Dockerfile #29

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update Dockerfile #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7b45fbb
Change 'hexo-util/lib/spawn' to 'hexo-util/dist/spawn'
huntertran Mar 3, 2024
8263316
Update Dockerfile
AlexHaijiaZhu Apr 12, 2024
0bb658c
Update Dockerfile
AlexHaijiaZhu Apr 12, 2024
e50a87b
Update entrypoint.sh
AlexHaijiaZhu Apr 12, 2024
80e8912
Update entrypoint.sh
AlexHaijiaZhu Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM node:12-buster-slim
FROM node:lts-bullseye-slim

LABEL version="1.0.3"

LABEL version="1.0.5"
LABEL repository="https://github.com/sma11black/hexo-action"
LABEL homepage="https://sma11black.github.io"
LABEL maintainer="sma11black <[email protected]>"
Expand Down
6 changes: 3 additions & 3 deletions entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ npm install hexo-deployer-git --save
# deployment
if [ "$INPUT_COMMIT_MSG" = "none" ]
then
hexo g -d
hexo g --deploy
elif [ "$INPUT_COMMIT_MSG" = "" ] || [ "$INPUT_COMMIT_MSG" = "default" ]
then
# pull original publish repo
NODE_PATH=$NODE_PATH:$(pwd)/node_modules node /sync_deploy_history.js
hexo g -d
hexo g --deploy
else
NODE_PATH=$NODE_PATH:$(pwd)/node_modules node /sync_deploy_history.js
hexo g -d -m "$INPUT_COMMIT_MSG"
hexo g --deploy -m "$INPUT_COMMIT_MSG"
fi

echo ::set-output name=notify::"Deploy complate."
2 changes: 1 addition & 1 deletion sync_deploy_history.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
const pathFn = require('path');
const fs = require('fs');
const parseConfig = require('hexo-deployer-git/lib/parse_config');
const spawn = require('hexo-util/lib/spawn');
const spawn = require('hexo-util/dist/spawn');
const Hexo = require('hexo');

async function sync_deploy_history() {
Expand Down