Skip to content

Commit f51649c

Browse files
committed
docker: Update dockerfile
Signed-off-by: Ce Gao <ce.gao@outlook.com>
1 parent 3b5bfa1 commit f51649c

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

.docker/generate-ant-file-in-docker.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ source "$(dirname "${BASH_SOURCE}")/../scripts/utils/generator-util.sh"
55
# Paths
66
# Those paths are not needed when building runner.jar,
77
# but will be used in the future to package the mode.
8-
modes="/mock-user/modes"
8+
modes="/root/sketchbook/modes"
99
executable="/mock-user/Processing"
1010
# Those paths are important to build runner.jar.
11-
processing="/code/processing"
1211
core="/code/processing/core/library/core.jar"
1312
pde="/code/processing/lib/pde.jar"
1413

Dockerfile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,15 @@ RUN apt-get update && \
1010
ant
1111

1212
# Download Processing.
13-
RUN curl -L http://download.processing.org/processing-3.3-linux64.tgz > /code/processing.tgz && \
13+
# Dev operation: copy processing into the image.
14+
# COPY processing-3.3.3-linux64.tgz /code/processing.tgz
15+
# RUN tar xvf /code/processing.tgz -C /code && \
16+
# mv /code/processing-3.3.3 /code/processing && \
17+
# rm -rf /code/processing.tgz
18+
# Prod operation: Download processing from processing.org.
19+
RUN curl -L http://download.processing.org/processing-3.3.3-linux64.tgz > /code/processing.tgz && \
1420
tar xvf /code/processing.tgz -C /code && \
15-
mv /code/processing-3.3 /code/processing && \
21+
mv /code/processing-3.3.3 /code/processing && \
1622
rm -rf /code/processing.tgz
1723

1824
# Install Oracle JDK 1.8
@@ -44,3 +50,6 @@ WORKDIR /code/processing.r
4450
RUN bash .docker/generate-ant-file-in-docker.sh && \
4551
ant try && \
4652
mv try/RLangMode.jar /code/runner
53+
54+
RUN /code/processing/processing && \
55+
ant install

0 commit comments

Comments
 (0)