esoko/mapguesser
esoko/mapguesser
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

Merged in bugfix/MAPG-183-tooling-fixes (pull request #157)

Browse Source 
MAPG-183 tooling fixes
This commit is contained in:
Bence Pőcze 2020-06-26 22:40:14 +00:00
commit ee6aa59253
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/Dockerfile
View File

@ -21,7 +21,7 @@ RUN ./install-composer.sh
# Install Node.js and required packages # Install Node.js and required packages
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
RUN apt install -y nodejs RUN apt install -y nodejs
RUN npm install -g uglify-js clean-css-cli svgo RUN npm install -g uglify-js clean-css-cli svgo yarn
EXPOSE 80 EXPOSE 80
VOLUME /var/www/mapguesser VOLUME /var/www/mapguesser

6
scripts/update.sh
View File

@ -5,7 +5,11 @@ ROOT_DIR=$(dirname $(readlink -f "$0"))/..
. ${ROOT_DIR}/.env . ${ROOT_DIR}/.env
echo "Installing Composer packages..." echo "Installing Composer packages..."
(cd ${ROOT_DIR} && composer install --no-dev) if [ -z "${DEV}" ] || [ "${DEV}" -eq "0" ]; then
(cd ${ROOT_DIR} && composer install --no-dev)
else
(cd ${ROOT_DIR} && composer install --dev)
fi
echo "Installing Yarn packages..." echo "Installing Yarn packages..."
(cd ${ROOT_DIR}/public/static && yarn install) (cd ${ROOT_DIR}/public/static && yarn install)