Skip to content

Commit

Permalink
fix php 8.2 alpine building error
Browse files Browse the repository at this point in the history
  • Loading branch information
joyqi committed Jan 1, 2024
1 parent e720ac8 commit 8da729a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ RUN sed -i "s/<shell>/$(use bash sh)/g" /bin/init_typecho \
&& savedAptMark="$(before)" \
&& `use "apt-get update" "apk update"` \
&& `use "apt-get install --no-install-recommends -y" "apk add --no-cache --virtual .build-deps"` \
`use - linux-headers` \
`use libfreetype6-dev freetype-dev` \
`use libjpeg62-turbo-dev libjpeg-turbo-dev` \
`use libpq-dev postgresql-dev` \
Expand Down
8 changes: 6 additions & 2 deletions scripts/use.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
IS_APLINE=$(cat /etc/os-release | grep "NAME=" | grep -ic "Alpine")

if [ ${IS_APLINE} -gt 0 ]; then
echo $2
if [ "$2" != "-" ]; then
echo $2
fi
else
echo $1
if [ "$1" != "-" ]; then
echo $1
fi
fi

0 comments on commit 8da729a

Please sign in to comment.