@@ -6,7 +6,7 @@ all:: dev
66
77OOD_UID := $(shell id -u)
88OOD_GID := $(shell id -g)
9- OOD_TAG := 2.0.16 -1.el7
9+ OOD_TAG := 2.0.29 -1.el7
1010SLURM_TAG := slurm-21-08-6-1
1111REMOTE_USERNAME := $(if $(SSH_USERNAME ) ,$(SSH_USERNAME ) ,$(USER ) )
1212SID_SLURM_IMAGE := hmdc/sid-slurm:$(SLURM_TAG )
@@ -45,17 +45,17 @@ remote-dev remote-fasse: version
4545 $(ENV ) http_proxy=$(HTTP_PROXY ) https_proxy=$(HTTPS_PROXY ) docker-compose build
4646 @echo " You need to be connected to the VPN"
4747 ssh $(REMOTE_USERNAME ) @$(LOGIN_HOST ) mkdir -p $(APP_FOLDER )
48- $(ENV ) docker-compose run --no-deps --entrypoint=" " ood su - ood bash -c " export PATH=/home/ood/bin:/home/ood/ondemand/dev/dashboard/node_modules/.bin:$$ PATH; cd /home/ood/ondemand/dev/dashboard; scl enable rh-ruby27 rh-nodejs12 'gem install --user-install bundler -v 2.1.4 && bundle config --local path 'vendor/bundle' && bundle install && npm install yarn --save && bundle exec rake assets:precompile'"
48+ $(ENV ) docker-compose run --no-deps --entrypoint=" " ood su - ood bash -c " export PATH=/home/ood/bin:/home/ood/ondemand/dev/dashboard/node_modules/.bin:$$ PATH; cd /home/ood/ondemand/dev/dashboard; scl enable rh-ruby27 rh-nodejs14 'gem install --user-install bundler -v 2.1.4 && bundle config --local path 'vendor/bundle' && bundle install && npm install yarn --save && bundle exec rake assets:precompile'"
4949 @echo " You need to be connected to the VPN"
5050 @./download_and_check.sh $(REMOTE_USERNAME ) $(TEMPLATE_URL ) /$(TURBOVNC_TEMPLATE ) $(TEMPLATE_LOCATION ) /$(TURBOVNC_TEMPLATE ) $(CHECK_TEMPLATE_VERSION )
5151 @./download_and_check.sh $(REMOTE_USERNAME ) $(TEMPLATE_URL ) /$(KVM_TEMPLATE ) $(TEMPLATE_LOCATION ) /$(KVM_TEMPLATE ) $(CHECK_TEMPLATE_VERSION )
5252 rsync -avz --delete --exclude-from=' rsync-exclude.conf' ./application/ -e ssh $(REMOTE_USERNAME ) @$(LOGIN_HOST ) :$(APP_FOLDER )
5353
5454test :
55- $(ENV ) docker-compose run --no-deps --entrypoint=" " ood su - ood bash -c " export PATH=/home/ood/bin:/home/ood/ondemand/dev/dashboard/node_modules/.bin:$$ PATH; cd /home/ood/ondemand/dev/dashboard; scl enable rh-ruby27 rh-nodejs12 'gem install --user-install bundler -v 2.1.4 && bundle config --local path 'vendor/bundle' && bundle install && npm install yarn --save && bundle exec rake test'"
55+ $(ENV ) docker-compose run --no-deps --entrypoint=" " ood su - ood bash -c " export PATH=/home/ood/bin:/home/ood/ondemand/dev/dashboard/node_modules/.bin:$$ PATH; cd /home/ood/ondemand/dev/dashboard; scl enable rh-ruby27 rh-nodejs14 'gem install --user-install bundler -v 2.1.4 && bundle config --local path 'vendor/bundle' && bundle install && npm install yarn --save && bundle exec rake test'"
5656
5757release : next-version
58- $(ENV ) docker-compose run --no-deps --entrypoint=" " ood su - ood bash -c " export PATH=/home/ood/bin:/home/ood/ondemand/dev/dashboard/node_modules/.bin:$$ PATH; export RAILS_ENV=production; cd /home/ood/ondemand/dev/dashboard; scl enable rh-ruby27 rh-nodejs12 'gem install --user-install bundler -v 2.1.4 && bundle config --local path 'vendor/bundle' && bundle install && npm install yarn --save && bundle exec rake assets:precompile'"
58+ $(ENV ) docker-compose run --no-deps --entrypoint=" " ood su - ood bash -c " export PATH=/home/ood/bin:/home/ood/ondemand/dev/dashboard/node_modules/.bin:$$ PATH; export RAILS_ENV=production; cd /home/ood/ondemand/dev/dashboard; scl enable rh-ruby27 rh-nodejs14 'gem install --user-install bundler -v 2.1.4 && bundle config --local path 'vendor/bundle' && bundle install && npm install yarn --save && bundle exec rake assets:precompile'"
5959 mkdir -p ./target
6060 tar -czvf ./target/sid2-dashboard.tar.gz ./application
6161
0 commit comments