Skip to content

Commit 3ef5412

Browse files
committed
Rollback to old build system following issues with ES6 code in IE
# Sigh. We're not using Babel in the new system, and so it only worked in # Chrome . . .
1 parent 877a611 commit 3ef5412

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ FROM nginx:stable
33
ARG API_VERSION
44
ARG SUBJECT
55

6-
COPY ./build-$SUBJECT/ /usr/share/nginx/html
6+
#COPY ./build-$SUBJECT/ /usr/share/nginx/html
7+
# FIXME - delete the next line:
8+
COPY ./build/ /usr/share/nginx/html
79
COPY nginx.conf /etc/nginx/nginx.conf
810
EXPOSE 80
911

build.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,14 @@ else
3737
fi
3838

3939
npm install
40-
npm run build-cs
41-
npm run build-phy
42-
docker build -t "docker.isaacscience.org/isaac-cs-app:${VERSION_TO_DEPLOY}" --pull --build-arg API_VERSION=$SEGUE_VERSION --build-arg SUBJECT=cs .
43-
docker build -t "docker.isaacscience.org/isaac-phy-app:${VERSION_TO_DEPLOY}" --pull --build-arg API_VERSION=$SEGUE_VERSION --build-arg SUBJECT=physics .
40+
#npm run build-cs
41+
#npm run build-phy
42+
npm run build # FIXME - remove this line!
43+
#docker build -t "docker.isaacscience.org/isaac-cs-app:${VERSION_TO_DEPLOY}" --pull --build-arg API_VERSION=$SEGUE_VERSION --build-arg SUBJECT=cs .
44+
#docker build -t "docker.isaacscience.org/isaac-phy-app:${VERSION_TO_DEPLOY}" --pull --build-arg API_VERSION=$SEGUE_VERSION --build-arg SUBJECT=physics .
45+
docker build -t "docker.isaacscience.org/isaac-cs-app:${VERSION_TO_DEPLOY}" --pull --build-arg API_VERSION=$SEGUE_VERSION . # FIXME - remove this line!
4446
docker push "docker.isaacscience.org/isaac-cs-app:${VERSION_TO_DEPLOY}"
45-
docker push "docker.isaacscience.org/isaac-phy-app:${VERSION_TO_DEPLOY}"
47+
#docker push "docker.isaacscience.org/isaac-phy-app:${VERSION_TO_DEPLOY}"
4648

4749
cd ..
4850
rm -rf isaac-cs-app

0 commit comments

Comments
 (0)