extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

nodejs PPA does NOT exist for ppc64le, falling back to the version included in Ubuntu and the separate npm package

Browse Source
This commit is contained in:
ralf 2023-04-12 17:14:54 +02:00
parent 7e7facfb62
commit 55fe2fec29
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/docker/fpm/Dockerfile
View File

@ -1,6 +1,6 @@
################################################################################
##
## EGroupware FPM container using Ubuntu 18.04 and PHP 7.3 from ondrej/php PPA
## EGroupware FPM container using Ubuntu 20.04 and PHP 8.1 from ondrej/php PPA
##
################################################################################
ARG ARCH=
@ -14,7 +14,8 @@ ARG PHP_VERSION=8.1
ENV VERSION=$VERSION
ENV PHP_VERSION=$PHP_VERSION
RUN apt-get update \
RUN set -e \
&& apt-get update \
&& apt-get install -y software-properties-common \
&& LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php \
&& apt-get update \
@ -81,6 +82,8 @@ exit $RESULT' \
# install nodejs 16.x PPA (Shoelace requires >= 14.17, Ubuntu 22.04 only has 12.x)
&& curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \
&& apt-get install -y nodejs \
# nodejs PPA does NOT exist for ppc64le, therefore we need to install npm separate, as not included in stock nodejs on Ubuntu
&& test -f /usr/bin/npm || apt-get install -y npm \
&& npm install -g grunt-cli \
&& npm install \
&& grunt \

4
doc/docker/fpm/build.sh
View File

@ -37,7 +37,7 @@ docker pull ubuntu:20.04
# add further tags for default PHP version only
[ $PHP_VERSION = $DEFAULT_PHP_VERSION -a "$BRANCH" != $VERSION -a "dev-${BRANCH}" != $VERSION ] && {
extra_tags="$tags --tag egroupware/egroupware:latest --tag egroupware/egroupware:$BRANCH"
extra_tags="--tag egroupware/egroupware:latest --tag egroupware/egroupware:$BRANCH"
}
if docker buildx 2>&1 >/dev/null
@ -48,7 +48,7 @@ else
# no buildx, eg. on dev only builds amd64!
docker build --build-arg "VERSION=$VERSION" --build-arg "PHP_VERSION=$PHP_VERSION" --tag egroupware/egroupware:$TAG . && {
docker push egroupware/egroupware:$TAG
for tag in $tags
for tag in $extra_tags
do
[ -z "$tag" -o "$tag" = "--tags" ] || {
docker tag egroupware/egroupware:$TAG $tag