Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
c8f48a4a
Unverified
Commit
c8f48a4a
authored
Jan 29, 2023
by
neil
Committed by
GitHub
Jan 29, 2023
Browse files
Merge pull request #4478 from acmesh-official/dev
sync
parents
71c273fb
c2ad1b4e
Changes
3
Show whitespace changes
Inline
Side-by-side
.github/workflows/dockerhub.yml
View file @
c8f48a4a
...
...
@@ -28,9 +28,9 @@ jobs:
id
:
step_one
run
:
|
if [ "$DOCKER_PASSWORD" ] ; then
echo "
::set-output name=
hasToken
::
true"
echo "hasToken
=
true"
>>$GITHUB_OUTPUT
else
echo "
::set-output name=
hasToken
::
false"
echo "hasToken
=
false"
>>$GITHUB_OUTPUT
fi
-
name
:
Check the value
run
:
echo ${{ steps.step_one.outputs.hasToken }}
...
...
Dockerfile
View file @
c8f48a4a
...
...
@@ -26,7 +26,7 @@ COPY ./ /install_acme.sh/
RUN
cd
/install_acme.sh
&&
([
-f
/install_acme.sh/acme.sh
]
&&
/install_acme.sh/acme.sh
--install
||
curl https://get.acme.sh | sh
)
&&
rm
-rf
/install_acme.sh/
RUN
ln
-s
/root/.acme.sh/acme.sh
/usr/local/bin/acme.sh
&&
crontab
-l
|
grep
acme.sh |
sed
's#> /dev/null##'
| crontab -
RUN
ln
-s
/root/.acme.sh/acme.sh /usr/local/bin/acme.sh
&&
crontab
-l
|
grep
acme.sh |
sed
's#> /dev/null#
> /proc/1/fd/1 2>/proc/1/fd/2
#'
| crontab -
RUN for
verb
in
help
\
version
\
...
...
acme.sh
View file @
c8f48a4a
...
...
@@ -1852,9 +1852,14 @@ _inithttp() {
_ACME_CURL="$_ACME_CURL --cacert $CA_BUNDLE "
fi
if
_contains
"
$(
curl
--help
2>&1
)
"
"--globoff"
;
then
if _contains "$(curl --help 2>&1)"
"--globoff" || _contains "$(curl --help curl 2>&1)"
"--globoff"; then
_ACME_CURL="$_ACME_CURL -g "
fi
#from curl 7.76: return fail on HTTP errors but keep the body
if _contains "$(curl --help http 2>&1)" "--fail-with-body"; then
_ACME_CURL="$_ACME_CURL --fail-with-body "
fi
fi
if [ -z "$_ACME_WGET" ] && _exists "wget"; then
...
...
@@ -1872,12 +1877,12 @@ _inithttp() {
elif [ "$CA_BUNDLE" ]; then
_ACME_WGET="$_ACME_WGET --ca-certificate=$CA_BUNDLE "
fi
fi
#from wget 1.14: do not skip body on 404 error
if
[
"
$_ACME_WGET
"
]
&&
_contains
"
$(
$_ACME_WGET
--help
2>&1
)
"
"--content-on-error"
;
then
if _contains "$(
wget
--help 2>&1)" "--content-on-error"; then
_ACME_WGET="$_ACME_WGET --content-on-error "
fi
fi
__HTTP_INITIALIZED=1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment