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

Allow yarn version to be set in appliance makefile #310

Open
wants to merge 1 commit into
base: 18.x
Choose a base branch
from
Open

Allow yarn version to be set in appliance makefile #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion conf/yarn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,10 @@ curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key --keyring /usr/share

mv /etc/apt/sources.list.d/yarn.list.disabled /etc/apt/sources.list.d/yarn.list

YARN="yarn"
if [[ -n "$YARN_VER" ]]; then
YARN="$YARN=YARN_VER"
fi

apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install --assume-yes yarn
DEBIAN_FRONTEND=noninteractive apt-get install --assume-yes "$YARN"
2 changes: 1 addition & 1 deletion mk/turnkey.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ HOSTNAME ?= $(shell basename "$(shell pwd)")
# general TKL vars
CONF_VARS += HOSTNAME ROOT_PASS NONFREE BACKPORTS_NONFREE TKL_TESTING BACKPORTS
# set specific software versions
CONF_VARS += PHP_VERSION RUBY_VER NODE_VER
CONF_VARS += PHP_VERSION RUBY_VER NODE_VER YARN_VER
# Webmin/firewall related
CONF_VARS += WEBMIN_THEME WEBMIN_FW_TCP_INCOMING WEBMIN_FW_TCP_INCOMING_REJECT WEBMIN_FW_UDP_INCOMING WEBMIN_FW_NAT_EXTRA WEBMIN_FW_MANGLE_EXTRA
# these are needed to control styling of credits (e.g., conf/apache-credit)
Expand Down