Commit 9251174f authored by Cameron Carney's avatar Cameron Carney

Bump version to v0.6.2

parent 6ebb54a3
FROM alpine:edge FROM alpine:3.6
MAINTAINER Cameron Carney <ccarney16@live.com> MAINTAINER Cameron Carney <ccarney16@live.com>
ENV CONFIG_FILE=/data/pterodactyl.conf \ ENV CONFIG_FILE=/data/pterodactyl.conf \
STARTUP_TIMEOUT=15 \ STARTUP_TIMEOUT=15 \
STORAGE_DIR=/data/storage \ STORAGE_DIR=/data/storage \
PANEL_VERSION=v0.6.1 PANEL_VERSION=v0.6.2
WORKDIR /var/www/html WORKDIR /var/www/html
RUN \ RUN \
echo http://nl.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories \ apk update \
&& echo http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories \
&& echo http://nl.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories \
&& apk update \
&& apk 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-tokenizer php7-ctype php7-zlib php7-zip supervisor \ php7-session php7-tokenizer php7-ctype php7-zlib php7-zip supervisor \
......
...@@ -43,7 +43,7 @@ __*Database Options*__ ...@@ -43,7 +43,7 @@ __*Database Options*__
__*Mailing Options*__ __*Mailing Options*__
* *MAIL_DRIVER*: * *MAIL_DRIVER*:
* *MAIL_EMAIL*: * *MAIL_EMAIL*:
* *MAIL_FROM_NAME*: * *MAIL_FROM*:
__*Memcached Only Options*__ __*Memcached Only Options*__
......
...@@ -10,7 +10,7 @@ https://github.com/ccarney16/pterodactyl-panel-dockerfile ...@@ -10,7 +10,7 @@ https://github.com/ccarney16/pterodactyl-panel-dockerfile
Docker: Docker:
It is recommended to create an environment file and run the following command: It is recommended to create an environment file and run the following command:
`docker run --name=pterodactyl-panel -p 80:80 -p 443:443 --env-file=./.env quay.io/ccarney/pterodactyl-panel:v0.6.1` `docker run --name=pterodactyl-panel -p 80:80 -p 443:443 --env-file=./.env quay.io/ccarney/pterodactyl-panel:v0.6.2`
__or__ __or__
...@@ -34,7 +34,7 @@ __Minor Revisions & Configuration Changes:__ ...@@ -34,7 +34,7 @@ __Minor Revisions & Configuration Changes:__
Docker: Docker:
It is recommended to create a environment file and run the following command: `docker run --rm -v <root>:/data --env-file=./.env quay.io/ccarney/pterodactyl-panel:v0.6.0 p:update` It is recommended to create a environment file and run the following command: `docker run --rm -v <root>:/data --env-file=./.env quay.io/ccarney/pterodactyl-panel:v0.6.2 p:update`
Docker Compose: Docker Compose:
......
...@@ -71,8 +71,8 @@ services: ...@@ -71,8 +71,8 @@ services:
- MAIL_DRIVER=mail - MAIL_DRIVER=mail
- MAIL_EMAIL=admin@localhost - MAIL_EMAIL=admin@localhost
- MAIL_FROM_NAME=Pterodactyl Panel - MAIL_FROM="Pterodactyl Panel"
image: quay.io/ccarney/pterodactyl-panel:v0.6.1 image: quay.io/ccarney/pterodactyl-panel:v0.6.2
ports: ports:
- 80:80 - 80:80
- 443:443 - 443:443
...@@ -83,10 +83,10 @@ services: ...@@ -83,10 +83,10 @@ services:
# - ./certs:/certs # - ./certs:/certs
## ##
# If you plan on running the daemon on the same machine, uncomment the section below # If you plan on running the daemon on the same machine, uncomment the section below.
## ##
# daemon: # daemon:
# image: quay.io/ccarney/pterodactyl-daemon:v0.4.1 # image: quay.io/ccarney/pterodactyl-daemon:v0.4.2
# depends_on: # depends_on:
# - panel # - panel
# ports: # ports:
......
...@@ -80,8 +80,8 @@ function updateConfiguration { ...@@ -80,8 +80,8 @@ function updateConfiguration {
--dbuser="${DB_USERNAME}" \ --dbuser="${DB_USERNAME}" \
--dbpass="${DB_PASSWORD}" \ --dbpass="${DB_PASSWORD}" \
--driver="${CACHE_DRIVER}" \ --driver="${CACHE_DRIVER}" \
--session-driver=database \ --session-driver="database" \
--queue-driver=database \ --queue-driver="database" \
--timezone="${TIMEZONE}" --timezone="${TIMEZONE}"
php artisan pterodactyl:mail -n \ php artisan pterodactyl:mail -n \
...@@ -91,7 +91,7 @@ function updateConfiguration { ...@@ -91,7 +91,7 @@ function updateConfiguration {
--port="${MAIL_PORT}" \ --port="${MAIL_PORT}" \
--username="${MAIL_USERNAME}" \ --username="${MAIL_USERNAME}" \
--password="${MAIL_PASSWORD}" \ --password="${MAIL_PASSWORD}" \
--from-name="${MAIL_FROM_NAME}" --from-name="${MAIL_FROM}"
php artisan migrate --force php artisan migrate --force
......
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