Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: GlenDC/docker-quake3
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: wouterds/rpi-quake3-server
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on Sep 4, 2019

  1. Copy the full SHA
    f16bd49 View commit details
  2. Copy the full SHA
    0772c4b View commit details
  3. 🚚 Moved files to root

    wouterds committed Sep 4, 2019
    Copy the full SHA
    edacd5e View commit details
  4. 📝 I'll write this later

    wouterds committed Sep 4, 2019
    Copy the full SHA
    55cd5d3 View commit details
  5. Copy the full SHA
    7d451b8 View commit details
  6. Copy the full SHA
    d3e156b View commit details
  7. 🔧 .editorconfig

    wouterds committed Sep 4, 2019
    Copy the full SHA
    f6ea8bb View commit details
  8. Copy the full SHA
    5e484e8 View commit details
  9. 🐛 Label final image

    wouterds committed Sep 4, 2019
    Copy the full SHA
    6ffea59 View commit details
  10. 🔥 Removed udp suffix

    wouterds committed Sep 4, 2019
    Copy the full SHA
    dbad506 View commit details
  11. Copy the full SHA
    3a7a8a3 View commit details
  12. Copy the full SHA
    a1b9a96 View commit details
  13. 🔧 .editorconfig

    wouterds committed Sep 4, 2019
    Copy the full SHA
    ca91627 View commit details
  14. 🙈 Ignore qemu-arm-static

    wouterds committed Sep 4, 2019
    Copy the full SHA
    46d9b8d View commit details
  15. Copy the full SHA
    5e498e9 View commit details
  16. 👷 Makefile for building

    wouterds committed Sep 4, 2019
    Copy the full SHA
    ba6a812 View commit details
  17. 🐛 arm bro

    wouterds committed Sep 4, 2019
    Copy the full SHA
    ace0cd2 View commit details
  18. 🙈 Ignore pak0.pk3

    wouterds committed Sep 4, 2019
    Copy the full SHA
    98f837c View commit details
  19. 📄 License

    wouterds committed Sep 4, 2019
    Copy the full SHA
    d277f68 View commit details
  20. Copy the full SHA
    7f1c8aa View commit details
  21. 🔧 Example server.cfg

    wouterds committed Sep 4, 2019
    Copy the full SHA
    8145067 View commit details
  22. Copy the full SHA
    571e446 View commit details
  23. Copy the full SHA
    f8d9b43 View commit details
  24. 👷 Push all tags

    wouterds committed Sep 4, 2019
    Copy the full SHA
    26170f9 View commit details
  25. 📝 Image, not container

    wouterds committed Sep 4, 2019
    Copy the full SHA
    d0b5552 View commit details
  26. 📝 Document client

    wouterds committed Sep 4, 2019
    Copy the full SHA
    1a5025c View commit details
  27. 🔧 Map cycle

    wouterds committed Sep 4, 2019
    Copy the full SHA
    ff2084e View commit details
  28. Copy the full SHA
    e081081 View commit details
  29. Copy the full SHA
    d2cab03 View commit details
  30. 🐛 Map udp port

    wouterds committed Sep 4, 2019
    Copy the full SHA
    e225c88 View commit details

Commits on Sep 6, 2019

  1. 📝 Added image

    wouterds authored Sep 6, 2019
    Copy the full SHA
    b8fcfeb View commit details

Commits on Sep 7, 2019

  1. ✨ Install script

    wouterds committed Sep 7, 2019
    Copy the full SHA
    9ff8e62 View commit details
  2. 📝 Updated README

    wouterds committed Sep 7, 2019
    Copy the full SHA
    55de42e View commit details
  3. 🔖 1.0.0

    wouterds committed Sep 7, 2019
    Copy the full SHA
    5741f65 View commit details
  4. 📝 Too obvious

    wouterds committed Sep 7, 2019
    Copy the full SHA
    80b1572 View commit details
  5. 📝 Clarified running

    wouterds committed Sep 7, 2019
    Copy the full SHA
    30af6b0 View commit details
  6. ✏️ quake3

    wouterds authored Sep 7, 2019
    Copy the full SHA
    c249590 View commit details

Commits on Jan 23, 2020

  1. 📝 Fixed cover image

    wouterds authored Jan 23, 2020
    Copy the full SHA
    0c05cc2 View commit details
Showing with 187 additions and 260 deletions.
  1. +11 −0 .editorconfig
  2. +2 −0 .gitignore
  3. +25 −0 Dockerfile
  4. +21 −0 LICENSE
  5. +31 −0 Makefile
  6. +38 −0 README.md
  7. +12 −0 docker-compose.yml
  8. +20 −0 install.sh
  9. +0 −16 quake3-osp/Dockerfile
  10. +0 −15 quake3-osp/README.md
  11. +0 −16 quake3-rq3/Dockerfile
  12. +0 −15 quake3-rq3/README.md
  13. +0 −24 quake3/Dockerfile
  14. +0 −174 quake3/README.md
  15. +27 −0 server.cfg
11 changes: 11 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# EditorConfig is awesome: http://EditorConfig.org

[*]
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 2

[Makefile]
indent_style = tab
indent_size = 4
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/qemu-arm-static
/pak0.pk3
25 changes: 25 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
FROM arm32v6/alpine

COPY ./qemu-arm-static /usr/bin/qemu-arm-static
RUN apk --no-cache add curl g++ gcc git make
RUN mkdir -p /tmp/build
RUN curl https://raw.githubusercontent.com/ioquake/ioq3/master/misc/linux/server_compile.sh -o /tmp/build/compile.sh
RUN curl https://ioquake3.org/data/quake3-latest-pk3s.zip --referer https://ioquake3.org/extras/patch-data/ -o /tmp/build/quake3-latest-pk3s.zip
RUN echo 'y' | sh /tmp/build/compile.sh
RUN unzip /tmp/build/quake3-latest-pk3s.zip -d /tmp/build/
RUN cp -r /tmp/build/quake3-latest-pk3s/* ~/ioquake3

FROM arm32v6/alpine
LABEL maintainer="wouterds <wouter.de.schuyter@gmail.com>"

COPY ./qemu-arm-static /usr/bin/qemu-arm-static
COPY --from=0 /root/ioquake3 /home/ioq3srv/ioquake3
RUN ln -sf /data/pak0.pk3 /home/ioq3srv/ioquake3/baseq3/pak0.pk3 && \
ln -sf /data/server.cfg /home/ioq3srv/ioquake3/baseq3/server.cfg && \
adduser ioq3srv -D && \
rm /usr/bin/qemu-arm-static

USER ioq3srv
EXPOSE 27960

ENTRYPOINT ["/home/ioq3srv/ioquake3/ioq3ded.arm", "+exec", "server.cfg"]
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) [year] [fullname]

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
31 changes: 31 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
all: tag

PWD = $(shell pwd)

VERSION = 1.0.0
PROJECT_NAME = rpi-quake3-server

DOCKERFILE = ./Dockerfile
TAG = wouterds/$(PROJECT_NAME)

clean:
-rm -f ./qemu-arm-static

qemu-arm-static:
docker run --rm --privileged multiarch/qemu-user-static:register --reset
curl -OL https://github.com/multiarch/qemu-user-static/releases/download/v4.1.0-1/qemu-arm-static
chmod +x qemu-arm-static

build: qemu-arm-static ./Dockerfile
docker build -f ./Dockerfile -t $(TAG) .

tag: build
docker tag $(TAG) $(TAG):$(VERSION)

push-version: tag
docker push $(TAG):$(VERSION)

push-latest: tag
docker push $(TAG):latest

push: push-version push-latest
38 changes: 38 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Quake III Arena Docker Alpine image with ARM support

This Docker image provides a simple Quake 3 dedicated server that runs on Raspberry Pi.

[![Quake 3 on Raspberry with Docker](https://wouterdeschuyter.be/static/media/2fc444b5-e80e-49bb-85ef-71c3023e0e88.jpg)](https://wouterdeschuyter.be/blog/running-a-dedicated-quake-3-arena-server-on-raspberry-pi-with-docker)

## Installing

### With script

```bash
curl -sSL https://github.com/wouterds/rpi-quake3-server/raw/master/install.sh | sh
```

### Manually

1. Create a directory where you'll run the project, e.g. `quake3`

2. Copy [`docker-compose.yml`](/docker-compose.yml) into the directory

3. Copy [`server.cfg`](/server.cfg) into the directory

4. Copy the [pak0.pk3](https://github.com/wouterds/rpi-quake3-server/releases/download/1.0.0/pak0.pk3) file into the directory


### Configuring

Change server settings by editing `./server.cfg`

## Running

```bash
docker-compose up -d
```

## Client

Find a client for your platform here: https://ioquake3.org/get-it
12 changes: 12 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: '2'

services:
server:
image: wouterds/rpi-quake3-server
restart: unless-stopped
volumes:
- ./pak0.pk3:/data/pak0.pk3
- ./server.cfg:/data/server.cfg
ports:
- '27960:27960/udp'
mem_limit: 64mb
20 changes: 20 additions & 0 deletions install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/sh
set -e

# This script is meant for quick & easy install via:
# $ curl -sSL https://github.com/wouterds/rpi-quake3-server/raw/master/install.sh | sh

echo 'Creating ./quake3 directory...'
mkdir quake3
cd quake3

echo 'Downloading assets...'
curl -LO https://github.com/wouterds/rpi-quake3-server/raw/master/docker-compose.yml
curl -LO https://github.com/wouterds/rpi-quake3-server/raw/master/server.cfg
curl -LO https://github.com/wouterds/rpi-quake3-server/releases/download/1.0.0/pak0.pk3

echo ''
echo 'Ready to go!'
echo ''
echo 'You can customize your server settings by editing: ./quake3/server.cfg'
echo 'When ready, start the server by running "cd ./quake3 && docker-compose up -d"'
16 changes: 0 additions & 16 deletions quake3-osp/Dockerfile

This file was deleted.

15 changes: 0 additions & 15 deletions quake3-osp/README.md

This file was deleted.

16 changes: 0 additions & 16 deletions quake3-rq3/Dockerfile

This file was deleted.

15 changes: 0 additions & 15 deletions quake3-rq3/README.md

This file was deleted.

24 changes: 0 additions & 24 deletions quake3/Dockerfile

This file was deleted.

Loading