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.

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

Update Ubuntu and NodeJS Bases #554

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

strategy:
matrix:
node-version: [12.x, 14.x, 16.x]
node-version: [18.x, 20.x, 22.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:focal
FROM ubuntu:noble
LABEL MAINTAINER='William Dizon <[email protected]>'

#update and accept all prompts
Expand All @@ -12,13 +12,14 @@ RUN apt-get update && apt-get install -y \
curl \
rlwrap \
unzip \
openjdk-21-jre-headless \
openjdk-17-jre-headless \
openjdk-8-jre-headless \
ca-certificates-java \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

#install node from nodesource following instructions: https://github.com/nodesource/distributions#debinstall
RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
&& apt-get install -y nodejs \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

Expand Down
9 changes: 5 additions & 4 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:focal as build
FROM ubuntu:noble as build
LABEL MAINTAINER='William Dizon <[email protected]>'

#set build directory
Expand All @@ -9,7 +9,7 @@ ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y \
curl \
build-essential \
&& curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
&& curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
&& apt-get install -y nodejs

# copy package.json and npm install
Expand All @@ -21,7 +21,7 @@ RUN npm install
COPY . /build

#final image
FROM ubuntu:focal
FROM ubuntu:noble

WORKDIR /usr/games/minecraft

Expand All @@ -34,10 +34,11 @@ RUN apt-get update && apt-get install -y \
git \
curl \
rlwrap \
openjdk-21-jre-headless \
openjdk-17-jre-headless \
openjdk-8-jre-headless \
ca-certificates-java \
&& curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
&& curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
&& apt-get install -y nodejs \
&& apt-get autoremove -y \
&& apt-get clean \
Expand Down
4 changes: 3 additions & 1 deletion mineos.js
Original file line number Diff line number Diff line change
Expand Up @@ -1158,7 +1158,9 @@ mineos.mc = function(server_name, base_dir) {
var lines = buffer.toString('ascii').split('\n');
var incrs = 0;

for (var i=0; i < lines.length; i++) {
// Since rdiff-backup v2.1.1a0 increments been listed in ascending order instead of descending
// https://github.com/rdiff-backup/rdiff-backup/blob/v2.1.1a0/CHANGELOG.adoc#11-changes
for (var i=lines.length-1; i >= 0; i--) {
var match = lines[i].match(regex);
if (match) {
increment_lines.push({
Expand Down
Loading