Commit 512efb8a authored by Cameron Carney's avatar Cameron Carney

Updated Dockerfile; entrypoint.sh.

parent d5677973
FROM alpine:3.6 FROM alpine:edge
MAINTAINER Cameron Carney <ccarney16@live.com> MAINTAINER Cameron Carney <ccarney16@live.com>
...@@ -8,21 +8,21 @@ ENV STARTUP_TIMEOUT=5 \ ...@@ -8,21 +8,21 @@ ENV STARTUP_TIMEOUT=5 \
WORKDIR /var/www/html WORKDIR /var/www/html
RUN \ RUN \
apk update \ apk --update add curl gettext nginx php7 php7 php7-bcmath php7-common php7-dom php7-fpm php7-gd \
&& apk add curl gettext nginx php7 php7 php7-bcmath php7-common php7-dom php7-fpm php7-gd \
php7-memcached php7-mbstring php7-openssl php7-pdo php7-phar php7-json php7-pdo_mysql \ php7-memcached php7-mbstring php7-openssl php7-pdo php7-phar php7-json php7-pdo_mysql \
php7-session php7-simplexml php7-tokenizer php7-ctype php7-zlib php7-zip supervisor \ php7-session php7-simplexml php7-tokenizer php7-ctype php7-zlib php7-zip supervisor \
&& mkdir -p /var/www/html /run/nginx && mkdir -p /var/www/html /run/nginx
RUN \ RUN \
curl -Lo "${PANEL_VERSION}.tar.gz" https://github.com/Pterodactyl/Panel/archive/${PANEL_VERSION}.tar.gz \ curl -Lo panel.tar.gz https://github.com/Pterodactyl/Panel/archive/${PANEL_VERSION}.tar.gz \
&& tar --strip-components=1 -xzvf ${PANEL_VERSION}.tar.gz \ && tar --strip-components=1 -xzvf panel.tar.gz \
&& rm "${PANEL_VERSION}.tar.gz" \ && rm panel.tar.gz \
&& chmod -R 755 storage/* bootstrap/cache \ && chmod -R 755 storage/* bootstrap/cache \
&& find storage -type d > .storage.tmpl \ && find storage -type d > .storage.tmpl \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
&& cp .env.example .env \
&& composer install --ansi --no-dev \ && composer install --ansi --no-dev \
&& rm ./storage -rf \ && rm .env ./storage -rf \
&& chown nginx:nginx * -R && chown nginx:nginx * -R
COPY ./manifest / COPY ./manifest /
......
...@@ -44,10 +44,6 @@ function startServer { ...@@ -44,10 +44,6 @@ function startServer {
sleep 5 sleep 5
# Clean out everything
php artisan config:cache -q
php artisan optimize -q
echo "" echo ""
echo "Generating key..." echo "Generating key..."
sleep 1 sleep 1
...@@ -60,10 +56,6 @@ function startServer { ...@@ -60,10 +56,6 @@ function startServer {
php artisan db:seed --force php artisan db:seed --force
fi fi
# Clear config cache and optimize on every startup
php artisan config:cache -q
php artisan optimize -q
# Allows Users to give MySQL/cache sometime to start up. # Allows Users to give MySQL/cache sometime to start up.
if [[ "${STARTUP_TIMEOUT}" -gt "0" ]]; then if [[ "${STARTUP_TIMEOUT}" -gt "0" ]]; then
echo "Starting Pterodactyl ${PANEL_VERSION} in ${STARTUP_TIMEOUT} seconds..." echo "Starting Pterodactyl ${PANEL_VERSION} in ${STARTUP_TIMEOUT} seconds..."
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment