Compare commits

..
Author SHA1 Message Date
Dominik Sokal 0f2ea12fff try out time again 2019-06-10 13:29:20 +02:00
Dominik Sokal 3588c5a5c4 don't move workingdir to /tmp 2019-06-10 12:57:03 +02:00
Stanisław Chmiela 1f94e38e60 Add support for universe-package.json-less shell apps everywhere (#82)
* Fix building SDK33 Android tarball without universe-package.json in single build mode

* Add CHANGELOG entry
2019-06-10 09:42:19 +02:00
+8 -7
View File
@@ -21,6 +21,7 @@ RUN dpkg --add-architecture i386 && \
libncurses5:i386\
libstdc++6:i386\
rsync\
time\
unzip\
yarn\
zlib1g:i386\
@@ -100,12 +101,12 @@ RUN rm gradle-4.4-all.zip
ENV GRADLE_HOME /usr/local/gradle-4.4
ENV PATH ${GRADLE_HOME}/bin:$PATH
ADD . /app
ADD . /app/turtle
RUN mv /app/workingdir /tmp && \
for SDK_VERSION in `ls /tmp/workingdir/android/`; do \
RUN mv /app/turtle/workingdir /app && \
for SDK_VERSION in `ls /app/workingdir/android/`; do \
echo "preparing $SDK_VERSION shell app" && \
cd /tmp/workingdir/android/$SDK_VERSION && \
cd /app/workingdir/android/$SDK_VERSION && \
if [ -f universe-package.json ]; then \
mv package.json exponent-package.json && \
mv universe-package.json package.json && \
@@ -116,11 +117,11 @@ RUN mv /app/workingdir /tmp && \
yarn install; \
fi \
; done && \
mv /tmp/workingdir /app
time mv /app/workingdir /app/turtle
ENV NODE_ENV "production"
ENV TURTLE_WORKING_DIR_PATH /app/workingdir/
ENV TURTLE_WORKING_DIR_PATH /app/turtle/workingdir/
WORKDIR /app
WORKDIR /app/turtle
CMD ["node", "./build/server.js"]