From 025c055c4875a29b33e8274238ecde409017b6da Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 15 May 2021 11:24:32 -0700 Subject: [PATCH] fork over the work from @matthewpi Will work on re-organizing and setting up a slightly different build matrix --- .github/workflows/docker-publish.yml | 81 ------------------------- .gitignore | 1 + README.md | 91 ++-------------------------- 3 files changed, 5 insertions(+), 168 deletions(-) delete mode 100644 .github/workflows/docker-publish.yml diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml deleted file mode 100644 index eb6ffdf..0000000 --- a/.github/workflows/docker-publish.yml +++ /dev/null @@ -1,81 +0,0 @@ -name: Docker - -on: - push: - branches: - - master - -jobs: - push: - name: Push - runs-on: ubuntu-20.04 - - strategy: - fail-fast: false - - matrix: - image: - - "alpine" - - "alpine-install" - - "fivem" - - "go1.14" - - "go1.15" - - "go1.16" - - "java7" - - "java8" - - "java9" - - "java10" - - "java11" - - "java12" - - "java13" - - "java14" - - "java15" - - "java16" - - "node12" - - "node14" - - "node15" - - "node16" - - "python3.7" - - "python3.8" - - "python3.9" - - "satisfactory" - - "source" - - "source-install" - - steps: - - name: Code Checkout - uses: actions/checkout@v2 - -# - name: Set up QEMU -# uses: docker/setup-qemu-action@v1 - - - name: Install buildx - uses: docker/setup-buildx-action@v1 - with: - version: v0.5.1 - buildkitd-flags: --debug - - - name: Login to GitHub Container Registry - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.CR_PAT }} - - - name: Login to Quay - uses: docker/login-action@v1 - with: - registry: quay.io - username: matthewp - password: ${{ secrets.QUAY_SECRET }} - - - name: Build and Push - uses: docker/build-push-action@v2 - with: - context: ./${{ matrix.image }} - file: ./${{ matrix.image }}/Dockerfile - platforms: linux/amd64 - push: true - tags: | - ghcr.io/matthewpi/images:${{ matrix.image }} - quay.io/matthewp/pterodactyl:${{ matrix.image }} diff --git a/.gitignore b/.gitignore index e43b0f9..4befed3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .DS_Store +.idea diff --git a/README.md b/README.md index 6f829a9..d60c373 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,9 @@ -# Images -This repository contains a bunch of images designed for use with Pterodactyl's egg system. Each image is rebuilt +# Yolks +A curated collection of core images that can be used with Pterodactyl's Egg system. Each image is rebuilt periodically to ensure dependencies are always up-to-date. -Images are hosted on both `ghcr.io` and `quay.io` for redundancy. - -To use any of these images, use `ghcr.io/matthewpi/images:` or `quay.io/matthewp/pterodactyl:`. +Images are hosted on both `ghcr.io` and `quay.io` for redundancy. To use any of these images, use +`ghcr.io/pterodactyl/yolks:` or `quay.io/pterodactyl/yolks:`. Any images ending with `-install` should only be used as a install image for running an install script, these images will not work to run the actual server and are only designed to reduce installation time and network usage by @@ -12,85 +11,3 @@ pre-installing common installation dependencies such as `curl` and `wget`. All of these images are available for `linux/amd64` and `linux/arm64` versions, unless otherwise specified, to use these images on an arm system, no modification to them or the tag is needed, they should just work. - -## Available Images -- [`alpine`](https://github.com/matthewpi/images/tree/master/alpine) - - `ghcr.io/matthewpi/images:alpine` - - `quay.io/matthewp/pterodactyl:alpine` -- [`fivem`](https://github.com/matthewpi/images/tree/master/fivem) - - `ghcr.io/matthewpi/images:fivem` - - `quay.io/matthewp/pterodactyl:fivem` -- [`go1.14`](https://github.com/matthewpi/images/tree/master/go1.14) - - `ghcr.io/matthewpi/images:go1.14` - - `quay.io/matthewp/pterodactyl:go1.14` -- [`go1.15`](https://github.com/matthewpi/images/tree/master/go1.15) - - `ghcr.io/matthewpi/images:go1.15` - - `quay.io/matthewp/pterodactyl:go1.15` -- [`go1.16`](https://github.com/matthewpi/images/tree/master/go1.16) - - `ghcr.io/matthewpi/images:go1.16` - - `quay.io/matthewp/pterodactyl:go1.16` -- [`java7`](https://github.com/matthewpi/images/tree/master/java7) - - `ghcr.io/matthewpi/images:java7` - - `quay.io/matthewp/pterodactyl:java7` -- [`java8`](https://github.com/matthewpi/images/tree/master/java8) - - `ghcr.io/matthewpi/images:java8` - - `quay.io/matthewp/pterodactyl:java8` -- [`java9`](https://github.com/matthewpi/images/tree/master/java9) - - `ghcr.io/matthewpi/images:java9` - - `quay.io/matthewp/pterodactyl:java9` -- [`java10`](https://github.com/matthewpi/images/tree/master/java10) - - `ghcr.io/matthewpi/images:java10` - - `quay.io/matthewp/pterodactyl:java10` -- [`java11`](https://github.com/matthewpi/images/tree/master/java11) - - `ghcr.io/matthewpi/images:java11` - - `quay.io/matthewp/pterodactyl:java11` -- [`java12`](https://github.com/matthewpi/images/tree/master/java12) - - `ghcr.io/matthewpi/images:java12` - - `quay.io/matthewp/pterodactyl:java12` -- [`java13`](https://github.com/matthewpi/images/tree/master/java13) - - `ghcr.io/matthewpi/images:java13` - - `quay.io/matthewp/pterodactyl:java13` -- [`java14`](https://github.com/matthewpi/images/tree/master/java14) - - `ghcr.io/matthewpi/images:java14` - - `quay.io/matthewp/pterodactyl:java14` -- [`java15`](https://github.com/matthewpi/images/tree/master/java15) - - `ghcr.io/matthewpi/images:java15` - - `quay.io/matthewp/pterodactyl:java15` -- [`java16`](https://github.com/matthewpi/images/tree/master/java16) - - `ghcr.io/matthewpi/images:java16` - - `quay.io/matthewp/pterodactyl:java16` -- [`node12`](https://github.com/matthewpi/images/tree/master/node12) - - `ghcr.io/matthewpi/images:node12` - - `quay.io/matthewp/pterodactyl:node12` -- [`node14`](https://github.com/matthewpi/images/tree/master/node14) - - `ghcr.io/matthewpi/images:node14` - - `quay.io/matthewp/pterodactyl:node14` -- [`node15`](https://github.com/matthewpi/images/tree/master/node15) - - `ghcr.io/matthewpi/images:node15` - - `quay.io/matthewp/pterodactyl:node15` -- [`node16`](https://github.com/matthewpi/images/tree/master/node16) - - `ghcr.io/matthewpi/images:node16` - - `quay.io/matthewp/pterodactyl:node16` -- [`python3.7`](https://github.com/matthewpi/images/tree/master/python3.7) - - `ghcr.io/matthewpi/images:python3.7` - - `quay.io/matthewp/pterodactyl:python3.7` -- [`python3.8`](https://github.com/matthewpi/images/tree/master/python3.8) - - `ghcr.io/matthewpi/images:python3.8` - - `quay.io/matthewp/pterodactyl:python3.8` -- [`python3.9`](https://github.com/matthewpi/images/tree/master/python3.9) - - `ghcr.io/matthewpi/images:python3.9` - - `quay.io/matthewp/pterodactyl:python3.9` -- [`satisfactory`](https://github.com/matthewpi/images/tree/master/satisfactory) - - `ghcr.io/matthewpi/images:satisfactory` - - `quay.io/matthewp/pterodactyl:satisfactory` -- [`source`](https://github.com/matthewpi/images/tree/master/source) - - `ghcr.io/matthewpi/images:source` - - `quay.io/matthewp/pterodactyl:source` - -### Installation Images -- [`alpine-install`](https://github.com/matthewpi/images/tree/master/alpine-install) - - `ghcr.io/matthewpi/images:alpine-install` - - `quay.io/matthewp/pterodactyl:alpine-install` -- [`source-install`](https://github.com/matthewpi/images/tree/master/source-install) - - `ghcr.io/matthewpi/images:source-install` - - `quay.io/matthewp/pterodactyl:source-install`