Skip to content

Build improvements #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
magneticflux- wants to merge 5 commits into from
Closed

Build improvements #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
03c1f54
Move quotes to surround entire path
magneticflux- Apr 8, 2020
c48473b
Disable shellcheck warnings when we actually want to split/glob argum…
magneticflux- Apr 8, 2020
024958b
Use minimal language in Travis CI to speed up build
magneticflux- Apr 8, 2020
c46a74b
Remove cache deletion as the Debian parent image handles it automatic…
magneticflux- Apr 8, 2020
467df6b
Update Dockerfile
mide Jun 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
language: minimal

services:
- docker

Expand Down
3 changes: 1 addition & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ RUN apt-get update && \
echo "deb http://overviewer.org/debian ./" >> /etc/apt/sources.list && \
wget -O - https://overviewer.org/debian/overviewer.gpg.asc | apt-key add - && \
apt-get update && \
apt-get install -y minecraft-overviewer && \
apt-get clean && \
apt-get install -y --no-install-recommends minecraft-overviewer && \
Comment thread
mide marked this conversation as resolved.
Comment thread
mide marked this conversation as resolved.
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
useradd -m minecraft && \
mkdir -p /home/minecraft/render /home/minecraft/server
Expand Down
4 changes: 3 additions & 1 deletion entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@ fi
# Download Minecraft client .jar (Contains textures used by Minecraft Overviewer)
CLIENT_URL=$(python3 /home/minecraft/download_url.py "$MINECRAFT_VERSION")
echo "Using Client URL $CLIENT_URL."
wget -N "${CLIENT_URL}" -O "${MINECRAFT_VERSION}.jar" -P /home/minecraft/.minecraft/versions/${MINECRAFT_VERSION}/
wget -N "${CLIENT_URL}" -O "${MINECRAFT_VERSION}.jar" -P "/home/minecraft/.minecraft/versions/${MINECRAFT_VERSION}/"

# Render the Map
if [ "$RENDER_MAP" == "true" ]; then
# shellcheck disable=SC2086
overviewer.py --config "$CONFIG_LOCATION" $ADDITIONAL_ARGS
fi

# Render the POI
if [ "$RENDER_POI" == "true" ]; then
# shellcheck disable=SC2086
overviewer.py --config "$CONFIG_LOCATION" --genpoi $ADDITIONAL_ARGS_POI
fi