Merge remote-tracking branch 'origin/source' into source

This commit is contained in:
Michael (Parker) Parker 2018-10-06 16:02:39 -04:00
commit 47c5cd8ede
2 changed files with 3 additions and 2 deletions

View File

@ -5,7 +5,8 @@
# ----------------------------------
FROM ubuntu:18.04
MAINTAINER Pterodactyl Software, <support@pterodactyl.io>
LABEL author="Pterodactyl Software" maintainer="support@pterodactyl.io"
ENV DEBIAN_FRONTEND noninteractive
# Install Dependencies
RUN dpkg --add-architecture i386 \

View File

@ -1,6 +1,6 @@
#!/bin/bash
cd /home/container
sleep 1
# Make internal Docker IP address available to processes.
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`