Commit Graph

60 Commits

Author SHA1 Message Date
WGOS
cdbc7c9b32 Merge branch 'debian/java-8-zulu' into java-zulu 2019-10-25 22:23:12 +03:00
WGOS
3cb9ed0723 Added timezone output 2019-10-25 22:22:20 +03:00
Egor
cbc332498e
Merge pull request #3 from WGOS/debian/java-8-zulu
Debian/java 8 zulu
2019-10-25 22:15:46 +03:00
Egor
64ea65e54c
Merge branch 'java-zulu' into debian/java-8-zulu 2019-10-25 22:15:13 +03:00
WGOS
8e74f0eda6 Added Dockerfile and entrypoint to work with Zulu on Debian 2019-10-25 22:01:49 +03:00
Michael (Parker) Parker
cd55bdbb14
Merge pull request #41 from parkervcp/debian/openjdk-8-jre into pterodactyl/images/java-glibc
Debian/openjdk 8 jre

replaced glibc image as it's debian based.
2019-04-17 10:20:33 -04:00
Michael (Parker) Parker
f68870db50
Merge branch 'java' into debian/openjdk-8-jre 2019-04-17 10:20:05 -04:00
Michael (Parker) Parker
313693a84a
Merge branch 'java-glibc' into debian/openjdk-8-jre 2019-04-17 10:16:36 -04:00
Michael (Parker) Parker
ac726a6d9f
Merge pull request #39 from parkervcp/breakfix/java
fix java timezone stupidity
2019-04-03 14:29:51 -04:00
Michael (Parker) Parker
562c37b83f forgot to add the route2 package 2019-03-31 22:04:00 -04:00
Michael (Parker) Parker
123a3d5681 add -y to apt-get command 2019-03-27 17:32:47 -04:00
Michael (Parker) Parker
3b1b2ba4d5 adding debian based openjdk 8 jre image 2019-03-27 17:12:38 -04:00
Dane Everitt
673714f637
Merge pull request #40 from parkervcp/breakfix/java-glibc
update to use the new frolvlad images
2019-03-05 12:06:49 -08:00
Michael (Parker) Parker
ebd31f6afd update to use the new frolvlad images
Use frolvlads new images.
Also fixes stupid java timezone issues.
2019-03-03 19:54:03 -05:00
Michael (Parker) Parker
93c91f060c fix java timezone stupidity
Java uses /etc/timezone but we are looping in /etc/localtime.
This just creates a symlink that fixes it.
2019-03-03 19:50:57 -05:00
Michael (Parker) Parker
3c5fcecb4a fix timezones for java on alpine 2019-03-03 19:44:59 -05:00
Michael (Parker) Parker
0f094dd8eb add tzdata to openjdk image 2019-03-03 19:22:01 -05:00
Dane Everitt
e15a911636
Merge pull request #34 from pterodactyl/revert-33-python3
Revert "Add Python3 to the master imagees repo"
2018-10-28 20:12:44 -07:00
Dane Everitt
a25a9588d2
Revert "Add Python3 to the master imagees repo" 2018-10-28 20:12:35 -07:00
Dane Everitt
f79cc73b97
Merge pull request #27 from tenten8401/patch-2
Add fontconfig to dockerfile dependencies
2018-10-28 12:33:18 -07:00
Dane Everitt
85b8f2e58f
Merge pull request #33 from parkervcp/python3
Add Python3 to the master imagees repo
2018-10-28 12:32:29 -07:00
Michael (Parker) Parker
9a7610cd3d updated python
Moved to latest python as a base and changed the entrypoint to show the python version instead of the 
 non-existent java version.
2018-10-07 09:12:09 -04:00
Michael (Parker) Parker
91ceefa5c3 adding fontconfig 2018-10-05 23:15:59 -04:00
Isaac A
03e7f558a4
Add fontconfig to dockerfile dependencies
Some plugins that deal with rendering fonts might throw a nasty error since it's a headless JDK, supposedly installing this package fixes the issue.
An example of the issue can be found here: https://hastebin.com/tegasuwedo.rb
2018-10-05 23:10:49 -04:00
Michael (Parker) Parker
47f1c87452
Merge pull request #17 from Exonical/python3
Fix Maintainer Deprecation
2018-07-13 18:52:30 -04:00
Michael (Parker) Parker
d436f347bd
Merge pull request #13 from Exonical/java
Fix Maintainer Deprecation
2018-07-13 18:51:41 -04:00
Exonical
175fa9372b
its fine 2018-07-13 16:42:38 -04:00
Unknown
bbd6cade27 Fix Maintainer Deprecation 2018-07-13 16:15:45 -04:00
Unknown
c4375a68c4 Fix Maintainer Deprecation 2018-07-13 16:09:57 -04:00
Michael (Parker) Parker
008a9d4f90 package update 2018-04-28 09:23:49 -04:00
Michael (Parker) Parker
d079417018 fixed entrypoint CMD 2018-03-27 08:51:14 -04:00
Dane Everitt
ec4e473e17
Merge pull request #23 from parkervcp/java
updating image
2018-03-25 11:37:16 -05:00
Dane Everitt
2d70bea48e
Merge pull request #21 from parkervcp/java-glibc
updating image
2018-03-25 11:36:28 -05:00
Michael (Parker) Parker
3cdb63f16a fixing the entrypoint 2018-03-25 09:40:28 -04:00
Michael (Parker) Parker
fc5f6b327a removing unnecessary things 2018-03-25 09:30:52 -04:00
Michael (Parker) Parker
c8207d06ee more python requirements 2018-03-24 21:54:15 -04:00
Michael (Parker) Parker
f493215bc1 basic python 3.6 support
New image for python 3
2018-03-24 20:29:58 -04:00
Michael (Parker) Parker
87ee3696ee updating image 2018-02-26 23:45:34 -05:00
Michael (Parker) Parker
c6f4892b95 updating image 2018-02-26 23:43:48 -05:00
Michael (Parker) Parker
5285ad483c Backt o master 2018-02-25 14:23:55 -05:00
Michael (Parker) Parker
e34921a403
Merge pull request #2 from Bl4ckSpr4y/samp
Samp
2018-02-25 14:21:10 -05:00
Bl4ckSpr4y
c3d35bd607
Create entrypoint.sh 2018-02-25 19:58:37 +02:00
Bl4ckSpr4y
aeac09ca25
Create Dockerfile 2018-02-25 19:58:11 +02:00
DoNotSpamPls
6ef01e33d1 Make some changes to README.md (#11)
* Make some changes to README.md

- Edited the "Current Containers" section so it doesn't have to be always updated
- Fixed a typo
- Bumped the copyright year.

* bump license year in LICENSE too

* show only active branches (will omit master from the list)

* Add a dot at the end of the sentence.

* They are images, not containers
2018-02-09 08:26:15 -06:00
Dane Everitt
ae7aa977be
dont sleep 2018-01-06 14:56:10 -06:00
Dane Everitt
c705b6fc61
cleaner output 2018-01-06 14:55:21 -06:00
Dane Everitt
9bb8ea32b8
Cleaner output when running container 2018-01-06 14:54:47 -06:00
Dane Everitt
8f159d0239
Add support for accessing internal IP
Pterodactyl/Panel#613
2017-10-09 23:09:54 -05:00
Dane Everitt
ce771b8866
Add support for accessing internal IP
Pterodactyl/Panel#613
2017-10-09 23:09:17 -05:00
Dane Everitt
efe3809d58 Merge pull request #2 from parkervcp/java
Update Dockerfile
2017-05-03 16:35:46 -04:00