Switch to Node.js 16 from Nodesource as that will be a dependency of Zammad 5.2 soon. (#279)
* Switch to Node.js 16 from Nodesource as that will be a dependency of Zammad 5.2 soon. * Fixed indentation.
This commit is contained in:
parent
8d24441c85
commit
4799b327d2
@ -37,7 +37,7 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
|
|||||||
org.label-schema.vcs-url="https://github.com/zammad/zammad" \
|
org.label-schema.vcs-url="https://github.com/zammad/zammad" \
|
||||||
org.label-schema.vcs-type="Git" \
|
org.label-schema.vcs-type="Git" \
|
||||||
org.label-schema.vendor="Zammad" \
|
org.label-schema.vendor="Zammad" \
|
||||||
org.label-schema.schema-version="5.1.0" \
|
org.label-schema.schema-version="5.1.0" \
|
||||||
org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up"
|
org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up"
|
||||||
|
|
||||||
ENV GIT_BRANCH stable
|
ENV GIT_BRANCH stable
|
||||||
|
@ -3,7 +3,7 @@ set -e
|
|||||||
|
|
||||||
# install dependencies
|
# install dependencies
|
||||||
if [ "$1" = 'builder' ]; then
|
if [ "$1" = 'builder' ]; then
|
||||||
PACKAGES="build-essential curl git libimlib2-dev libpq-dev nodejs shared-mime-info"
|
PACKAGES="build-essential curl git libimlib2-dev libpq-dev shared-mime-info"
|
||||||
elif [ "$1" = 'runner' ]; then
|
elif [ "$1" = 'runner' ]; then
|
||||||
PACKAGES="curl libimlib2 libpq5 nginx rsync"
|
PACKAGES="curl libimlib2 libpq5 nginx rsync"
|
||||||
fi
|
fi
|
||||||
@ -12,6 +12,22 @@ apt-get update
|
|||||||
apt-get upgrade -y
|
apt-get upgrade -y
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
apt-get install -y --no-install-recommends ${PACKAGES}
|
apt-get install -y --no-install-recommends ${PACKAGES}
|
||||||
|
|
||||||
|
if [ "$1" = 'builder' ]; then
|
||||||
|
# Install Node.js 16 repository from Nodesource
|
||||||
|
apt-get --no-install-recommends -y install gnupg
|
||||||
|
KEYRING=/usr/share/keyrings/nodesource.gpg
|
||||||
|
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor | tee "$KEYRING" >/dev/null
|
||||||
|
cat - > /etc/apt/sources.list.d/nodesource.list <<NODESOURCE_LIST
|
||||||
|
deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x buster main
|
||||||
|
NODESOURCE_LIST
|
||||||
|
|
||||||
|
apt-get update
|
||||||
|
apt-get --no-install-recommends -y install nodejs
|
||||||
|
npm -g install yarn
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Clean-up
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# install zammad
|
# install zammad
|
||||||
|
Loading…
Reference in New Issue
Block a user