Skip to content

Commit de15486

Browse files
committed
Fix of build error
1 parent a0ab786 commit de15486

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@ ARG src="Utilities Frontend/docker/supervisorConfigs"
1313
ARG srx="Utilities Frontend"
1414
COPY ${src} /etc/supervisor/conf.d
1515

16+
# TODO: Use master branch
17+
1618
RUN git clone https://github.com/rwth-acis/syncmeta.git
1719
WORKDIR /usr/src/app/syncmeta
1820
RUN git checkout chat-assessments
19-
# TODO: Use master branch
2021
COPY ${srx}/docker/_bot_widget.tpl /usr/src/app/syncmeta/widgets/src/widgets/partials/
2122
COPY ${srx}/docker/bot_widget.js /usr/src/app/syncmeta/widgets/src/js/
22-
COPY ${srx}/docker/_userManagement_widget.tpl /usr/src/app/syncmeta/widgets/src/widgets/partials/
23-
COPY ${srx}/docker/userManagement_widget.js /usr/src/app/syncmeta/widgets/src/js/
2423
COPY ${srx}/docker/Gruntfile.js /usr/src/app/syncmeta/widgets/
2524
COPY ${srx}/docker/yjs-sync.js /usr/src/app/syncmeta/widgets/src/js/lib/
2625
WORKDIR /usr/src/app/syncmeta

Utilities Frontend/Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ RUN npm_config_user=root npm install -g bower grunt-cli grunt polymer-cli gulp
1111

1212
COPY docker/supervisorConfigs /etc/supervisor/conf.d
1313

14-
RUN git clone https://github.com/rwth-acis/syncmeta.git
15-
1614
# TODO: Use master branch
15+
RUN git clone https://github.com/rwth-acis/syncmeta.git
16+
WORKDIR /usr/src/app/syncmeta
17+
RUN git checkout chat-assessments
1718
COPY docker/_bot_widget.tpl /usr/src/app/syncmeta/widgets/src/widgets/partials/
1819
COPY docker/bot_widget.js /usr/src/app/syncmeta/widgets/src/js/
1920
COPY docker/Gruntfile.js /usr/src/app/syncmeta/widgets/
20-
#COPY docker/yjs-sync.js /usr/src/app/syncmeta/widgets/src/js/lib/
21+
COPY docker/yjs-sync.js /usr/src/app/syncmeta/widgets/src/js/lib/
2122
WORKDIR /usr/src/app/syncmeta
22-
RUN git checkout chat-assessments && cd widgets && rm package-lock.json && npm install && bower install --allow-root
23+
RUN cd widgets && rm package-lock.json && npm install && bower install --allow-root
2324

2425
WORKDIR /usr/src/app
2526
COPY . .

0 commit comments

Comments
 (0)