diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2020-06-08 17:06:49 +0200 |
|---|---|---|
| committer | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2020-06-08 23:19:00 +0200 |
| commit | 8d8486bef1b08fbc43cc100cca83fe6d8bc09f28 (patch) | |
| tree | b3737bb386445e782e0d98d05fa390284e1564b6 | |
| parent | 7d9ab456a54674112760af1b0cbc6a1b2e587ba1 (diff) | |
| parent | ddbe854650c018a8164093821f9c90300fb0867e (diff) | |
Merge remote-tracking branch 'gitlab/master'
| -rw-r--r-- | Dockerfile | 9 | ||||
| -rwxr-xr-x | build/configure.sh | 2 | ||||
| -rw-r--r-- | database/gwf_converter/traces/default.gwf | 6 | ||||
| m--------- | opendc-frontend | 35 | ||||
| m--------- | opendc-web-server | 27 |
5 files changed, 54 insertions, 25 deletions
@@ -1,4 +1,4 @@ -FROM node:7.4 +FROM node:14.2.0 MAINTAINER Sacheendra Talluri <sacheendra.t@gmail.com> # Installing python and web-server dependencies @@ -11,14 +11,15 @@ RUN echo "deb http://ftp.debian.org/debian stretch main" >> /etc/apt/sources.lis COPY ./ /opendc # Setting up simulator -RUN python /opendc/opendc-web-server/setup.py install \ +RUN pip install -e /opendc/opendc-web-server \ + && python /opendc/opendc-web-server/setup.py install \ && chmod 555 /opendc/build/configure.sh \ && cd /opendc/opendc-frontend \ && rm -rf ./build \ && rm -rf ./node_modules \ - && npm install \ + && yarn \ && export REACT_APP_OAUTH_CLIENT_ID=$(cat ../keys.json | python -c "import sys, json; print json.load(sys.stdin)['OAUTH_CLIENT_ID']") \ - && npm run build + && yarn build # Set working directory WORKDIR /opendc diff --git a/build/configure.sh b/build/configure.sh index e8676960..eb7324d2 100755 --- a/build/configure.sh +++ b/build/configure.sh @@ -20,6 +20,8 @@ until eval $MYSQL_COMMAND -e "use opendc;" ; do sleep 1 done +echo "MariaDB available" + NUM_TABLES=$(eval "$MYSQL_COMMAND -B --disable-column-names -e \"SELECT count(*) FROM information_schema.tables WHERE table_schema='$MYSQL_DATABASE';\"") # Check if database is empty diff --git a/database/gwf_converter/traces/default.gwf b/database/gwf_converter/traces/default.gwf new file mode 100644 index 00000000..b1c55a17 --- /dev/null +++ b/database/gwf_converter/traces/default.gwf @@ -0,0 +1,6 @@ +WorkflowID, JobID , SubmitTime , RunTime , NProcs , ReqNProcs , Dependencies +0 , 1 , 1 , 1 , 1 , 1, 5 4 3 +0 , 2 , 2 , 2 , 2 , 2, 3 +0 , 3 , 3 , 3 , 3 , 3, 5 +0 , 4 , 4 , 4 , 4 , 4, +0 , 5 , 5 , 5 , 5 , 5, diff --git a/opendc-frontend b/opendc-frontend -Subproject a45da32a5d45370a865f683061dc801d4783da2 +Subproject 7032a007d4431f5a0c4c5e2d3f3bd20462d4995 diff --git a/opendc-web-server b/opendc-web-server -Subproject 39a147b14d9ad079433d5405c7a3d533851095f +Subproject d49328f321362bb410775e9c520a6f002448941 |