Skip to content

Commit 692a657

Browse files
committed
Added fetch_processing_jar.sh to automatically download the processing python JAR
1 parent 0517861 commit 692a657

3 files changed

Lines changed: 22 additions & 12 deletions

File tree

‎Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ deb http://archive.debian.org/debian-security stretch/updates main" > /etc/apt/s
77
# Disable the check for valid signatures on the archived repositories
88
# as the archived keys may not be up to date
99
RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y --allow-unauthenticated \
10+
wget \
11+
tar \
1012
python2.7 \
1113
python-pip \
1214
openjdk-8-jdk \

‎docker-compose.yml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,26 @@ version: '3.8'
22

33
services:
44
app:
5-
build: .
5+
build:
6+
context: .
7+
dockerfile: Dockerfile
68
image: processing-py-site
79
volumes:
810
- .:/usr/src/app
9-
- ./generated:/usr/src/app/generated
10-
command: tail -f /dev/null
1111

12-
build:
12+
fetch-jar:
1313
image: processing-py-site
1414
volumes:
1515
- .:/usr/src/app
16-
- ./generated:/usr/src/app/generated
16+
command: >
17+
sh -c "./fetch_processing_jar.sh"
18+
19+
build-site:
20+
image: processing-py-site
21+
command: python generator.py build
22+
23+
build-all:
24+
image: processing-py-site
1725
command: python generator.py build --all --images
1826

1927
serve:
@@ -22,4 +30,4 @@ services:
2230
- ./generated:/usr/src/app/generated
2331
ports:
2432
- "8080:80"
25-
command: sh -c "cd generated && python -m SimpleHTTPServer 80"
33+
command: sh -c "cd generated && python -m SimpleHTTPServer 80"

‎fetch_processing_jar.sh‎

100644100755
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/bin/bash
22

33
# Define global constants for URLs
4-
URL_LINUX64="http://py.processing.org/processing.py-linux64.tgz"
5-
URL_LINUX32="http://py.processing.org/processing.py-linux32.tgz"
6-
URL_MAC="http://py.processing.org/processing.py-macosx.tgz"
7-
URL_WINDOWS64="http://py.processing.org/processing.py-windows64.zip"
8-
URL_WINDOWS32="http://py.processing.org/processing.py-windows32.zip"
4+
URL_LINUX64="https://py.processing.org/processing.py-linux64.tgz"
5+
URL_LINUX32="https://py.processing.org/processing.py-linux32.tgz"
6+
URL_MAC="https://py.processing.org/processing.py-macosx.tgz"
7+
URL_WINDOWS64="https://py.processing.org/processing.py-windows64.zip"
8+
URL_WINDOWS32="https://py.processing.org/processing.py-windows32.zip"
99

1010
# Detect the operating system
1111
OS="unknown"
@@ -21,7 +21,7 @@ ARCH=$(uname -m)
2121
URL=""
2222

2323
if [ "$OS" == "Linux" ]; then
24-
if [ "$ARCH" == "x86_64" ]; then
24+
if [ "$ARCH" == "x86_64" ] || [ "$ARCH" == "aarch64" ]; then
2525
URL="$URL_LINUX64"
2626
elif [ "$ARCH" == "i386" ] || [ "$ARCH" == "i686" ]; then
2727
URL="$URL_LINUX32"

0 commit comments

Comments
 (0)