Compare commits

...

19 Commits
mono ... master

Author SHA1 Message Date
Michael (Parker) Parker
1d2a742d68
Merge pull request #54 from parkervcp/master
add bug template
2020-03-03 19:06:25 -08:00
Michael (Parker) Parker
5aef63b7f6
add bug template
sorry this is a mess
2019-11-15 07:42:19 -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
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
47f1c87452
Merge pull request #17 from Exonical/python3
Fix Maintainer Deprecation
2018-07-13 18:52:30 -04:00
Exonical
175fa9372b
its fine 2018-07-13 16:42:38 -04:00
Unknown
c4375a68c4 Fix Maintainer Deprecation 2018-07-13 16:09:57 -04:00
Michael (Parker) Parker
d079417018 fixed entrypoint CMD 2018-03-27 08:51:14 -04: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
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
3 changed files with 22 additions and 7 deletions

17
.github/ISSUE_TEMPLATE/bugs.md vendored Normal file
View File

@ -0,0 +1,17 @@
---
name: "\U0001F41B Bug Report"
about: Report an issue for an image
---
Please fill out the information bellow and remove from the line up
If you just submit a bug with no info I will close out your bug.
---------------
Panel Version: (version number)
Daemon Version: (version number)
Service: (minecraft/factorio/etc)
Docker Image:
Modified: (yes/no) (did you add or change things, this includes startup configs/install scripts/variables)
Errors that you are experiencing:

View File

@ -1,6 +1,6 @@
MIT License MIT License
Copyright (c) 2017 Pterodactyl Copyright (c) 2017-2018 Pterodactyl Software
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

View File

@ -2,14 +2,12 @@
This repository contains generic [Docker](https://docker.com) images that are used by Pterodactyl Panel to run games. With the release of `v0.6.0` of our panel, we have moved to making the install process be a completely seperate part of the process, making it much easier to maintain a smaller set of Dockerfiles. This repository contains generic [Docker](https://docker.com) images that are used by Pterodactyl Panel to run games. With the release of `v0.6.0` of our panel, we have moved to making the install process be a completely seperate part of the process, making it much easier to maintain a smaller set of Dockerfiles.
Our goal here is to maintain images that can run a wide variety of games in individual branches. For example, the [`java` branch](https://github.com/Pterodactyl/Containers/tree/java) is a standardized Docker container running on Alpine Linix that should support most all Minecraft based games, as well as java based games. We install all of the required dependencies that we ae aware of, but if you notice one missing, we welcome you to either raise an issue in here, or submit a PR to add it. Our goal here is to maintain images that can run a wide variety of games in individual branches. For example, the [`java` branch](https://github.com/Pterodactyl/Containers/tree/java) is a standardized Docker container running on Alpine Linux that should support most all Minecraft based games, as well as java based games. We install all of the required dependencies that we ae aware of, but if you notice one missing, we welcome you to either raise an issue in here, or submit a PR to add it.
The `entrypoint.sh` files **should not do any application installing**, and exist solely to parse startup commands passed to the container, and then run them, with a pause at the beginning to allow the Daemon time to boot and attach to the container. The `entrypoint.sh` files **should not do any application installing**, and exist solely to parse startup commands passed to the container, and then run them, with a pause at the beginning to allow the Daemon time to boot and attach to the container.
## Current Containers ## Current Images
[`java`](https://github.com/Pterodactyl/Containers/tree/java) Every branch, except master, is a different image. For a current list of images, check the branch list [here](https://github.com/Pterodactyl/Containers/branches/active).
[`source`](https://github.com/Pterodactyl/Containers/tree/source)
## Contributing ## Contributing
We welcome any contributions you might have. Please follow our formatting for Dockerfiles, which involves minimizing the number of layers, as well as the size of the container. If possible, please stick to Alpine Linux based images, however we do make use of `ubuntu:16.04` in the [`source` branch](https://github.com/Pterodactyl/Containers/tree/source) due to Source Engine limitations, and reducing the conflicts that might arise. We welcome any contributions you might have. Please follow our formatting for Dockerfiles, which involves minimizing the number of layers, as well as the size of the container. If possible, please stick to Alpine Linux based images, however we do make use of `ubuntu:16.04` in the [`source` branch](https://github.com/Pterodactyl/Containers/tree/source) due to Source Engine limitations, and reducing the conflicts that might arise.
@ -18,7 +16,7 @@ We welcome any contributions you might have. Please follow our formatting for Do
``` ```
MIT License MIT License
Copyright (c) 2017 Pterodactyl Software Copyright (c) 2017-2018 Pterodactyl Software
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal