Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Xonotic: gLibc incompatibility #3495

Merged
merged 2 commits into from
Nov 9, 2023
Merged

Xonotic: gLibc incompatibility #3495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4a026b
Xonotic: gLibc incompatibility
markmandel Nov 8, 2023
007d488
Merge branch 'main' into fix/xonotic-example
agones-bot Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/xonotic/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN curl -o xonotic.zip https://dl.xonotic.org/xonotic-0.8.6.zip && \
unzip -qq xonotic.zip && rm xonotic.zip

# final image
FROM debian:bullseye
FROM debian:bookworm

WORKDIR /home/xonotic

Expand Down
5 changes: 2 additions & 3 deletions examples/xonotic/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,15 @@ WINDOWS_DOCKER_PUSH_ARGS = --push
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
project_path := $(dir $(mkfile_path))
ifeq ($(REPOSITORY),)
server_tag := xonotic-example:1.4
server_tag := xonotic-example:1.5
else
server_tag := $(REPOSITORY)/xonotic-example:1.4
server_tag := $(REPOSITORY)/xonotic-example:1.5
endif

server_tag_linux_amd64 = $(server_tag)-linux-amd64
push_server_manifest = $(server_tag_linux_amd64)
root_path := $(realpath $(project_path)/../..)


ifeq ($(WITH_WINDOWS), 1)
push_server_manifest += $(foreach windows_version, $(WINDOWS_VERSIONS), $(server_tag)-windows_amd64-$(windows_version))
endif
Expand Down
2 changes: 1 addition & 1 deletion examples/xonotic/fleet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ spec:
spec:
containers:
- name: xonotic
image: us-docker.pkg.dev/agones-images/examples/xonotic-example:1.4
image: us-docker.pkg.dev/agones-images/examples/xonotic-example:1.5
2 changes: 1 addition & 1 deletion examples/xonotic/gameserver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ spec:
spec:
containers:
- name: xonotic
image: us-docker.pkg.dev/agones-images/examples/xonotic-example:1.4
image: us-docker.pkg.dev/agones-images/examples/xonotic-example:1.5
# imagePullPolicy: Always # add for development