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

AskOmics 17.12 #2

Merged
merged 2 commits into from
Dec 18, 2017
Merged

AskOmics 17.12 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f26fbd
create env when proxy prefix is set
xgaia Dec 18, 2017
ee90b65
target askomics 17.12
xgaia Dec 18, 2017
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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MAINTAINER Xavier Garnier '[email protected]'
# Environment variables
ENV ASKOMICS="https://github.com/askomics/askomics.git" \
ASKOMICS_DIR="/usr/local/askomics" \
ASKOMICS_VERSION="17.09" \
ASKOMICS_VERSION="17.12" \
SPARQL_UPDATE=true

# Copy files
Expand Down
12 changes: 10 additions & 2 deletions start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ username="Galaxy" #FIXME: get the galaxy username
pw_hash="" # no password
salt="" # no salt

# sed the dump tempalate
# sed the dump template
cp /dump.template.nq /dump.nq
sed -i "s@__USERNAME__@$username@g" /dump.nq
sed -i "s/__EMAIL__/$USER_EMAIL/g" /dump.nq
Expand Down Expand Up @@ -40,5 +40,13 @@ while ! wget -o /dev/null http://localhost:8890/conductor; do
sleep 1s
done

# manage proxy
if [[ $PROXY_PREFIX != "" ]]; then
# There is a proxy, export env for the askomics proxy
export ASKOCONFIG_app_colon_main_filter_hyphen_with='proxyprefix'
export ASKOCONFIG_filter_colon_proxyprefix_use='egg:PasteDeploy#prefix'
export ASKOCONFIG_filter_colon_proxyprefix_prefix=$PROXY_PREFIX
fi

# Start AskOmics
${ASKOMICS_DIR}/startAskomics.sh -r -d dev
${ASKOMICS_DIR}/startAskomics.sh -r