Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/deploy-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: [10, 12]
node: [22, 24]
permissions:
contents: read
packages: write
Expand All @@ -44,7 +44,7 @@ jobs:
github-token: ${{ github.token }}
flavor: |
latest=auto
suffix=${{ matrix.node != 10 && format('-node{0}', matrix.node) || '' }},onlatest=true
suffix=${{ matrix.node != 24 && format('-node{0}', matrix.node) || '' }},onlatest=true
tags: |
type=edge,branch=main
type=semver,pattern={{version}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [10, 12]
node: [22, 24]
steps:
- name: Get merge commit sha
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v24.14.1
26 changes: 22 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
},
"devDependencies": {
"@types/js-yaml": "^4.0.9",
"@types/node": "^10.17.60",
"@types/node": "^24.12.0",
"@types/q": "^1.5.8",
"typescript": "^5.6.2"
}
}
1 change: 0 additions & 1 deletion server/.nvmrc

This file was deleted.

19 changes: 6 additions & 13 deletions server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
ARG NODE_VERSION=10
ARG NODE_VERSION=24
FROM node:${NODE_VERSION}-slim AS base

ENV DEBIAN_FRONTEND=noninteractive

# Because Stretch is oldoldstable, it's in the archive now
RUN sed -i 's|deb.debian.org|archive.debian.org|g' /etc/apt/sources.list \
&& sed -i 's|security.debian.org|archive.debian.org|g' /etc/apt/sources.list \
&& sed -i '/stretch-updates/d' /etc/apt/sources.list
RUN apt-get update

# Install node-gyp dependencies
# We do not pin as we use multiple node versions.
# They are so old that there is no changes to their package registry anyway..
Expand All @@ -17,7 +11,7 @@ RUN apt-get update
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt,sharing=locked \
apt-get update \
&& apt-get install -y --no-install-recommends ca-certificates bash python make gcc g++ \
&& apt-get install -y --no-install-recommends ca-certificates bash python-is-python3 make gcc g++ \
&& rm -rf /var/lib/apt/lists/* \
&& update-ca-certificates

Expand All @@ -37,15 +31,13 @@ RUN cp -a /screeps/node_modules/@screeps/launcher/init_dist/.screepsrc ./ && \
# Gotta remove this Windows carriage return shenanigans
RUN sed -i "s/\r//" .screepsrc

# Fix up some of the bind adresses craziness
RUN sed -i "s/host = 0.0.0.0/host = ::/" .screepsrc && sed -i "s/cli_host = localhost/cli_host = ::/" .screepsrc

FROM node:${NODE_VERSION}-slim AS server

ENV DEBIAN_FRONTEND=noninteractive

# Because Stretch is oldoldstable, it's in the archive now
RUN sed -i 's|deb.debian.org|archive.debian.org|g' /etc/apt/sources.list \
&& sed -i 's|security.debian.org|archive.debian.org|g' /etc/apt/sources.list \
&& sed -i '/stretch-updates/d' /etc/apt/sources.list

# Install git for direct mod loading and wget for the healthcheck.
# ca-certificates and ssh allow mods/bots to be installed via npm using
# alternative formats such as:
Expand All @@ -59,6 +51,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
git \
wget \
ssh \
nano \
&& rm -rf /var/lib/apt/lists/* \
&& update-ca-certificates

Expand Down
Loading
Loading