From 9864902b95700a4cbb154c156243e95f8b5ceb78 Mon Sep 17 00:00:00 2001
From: Yukai Huang <yukaihuangtw@gmail.com>
Date: Thu, 24 Oct 2024 19:28:47 +0800
Subject: [PATCH 1/2] chore: bump base image to 18.20.4-bullseye
---
buildpack-18/Dockerfile | 2 +-
runtime-18/Dockerfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/buildpack-18/Dockerfile b/buildpack-18/Dockerfile
index 1226946..df36d48 100644
--- a/buildpack-18/Dockerfile
+++ b/buildpack-18/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18.16.0-bullseye
+FROM node:18.20.4-bullseye
ENV DEBIAN_VERSION_NAME bullseye
diff --git a/runtime-18/Dockerfile b/runtime-18/Dockerfile
index ee38bec..9c9fdc1 100644
--- a/runtime-18/Dockerfile
+++ b/runtime-18/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18.16.0-bullseye
+FROM node:18.20.4-bullseye
ENV DEBIAN_VERSION_NAME=bullseye NODE_ENV=production
ENV PORTCHECKER_VERSION=v1.1.0
From 4010b1920f52a5fad5e60f36a7b4fb668f34502c Mon Sep 17 00:00:00 2001
From: Yukai Huang <yukaihuangtw@gmail.com>
Date: Thu, 24 Oct 2024 19:29:45 +0800
Subject: [PATCH 2/2] fix: remove phantomjs installation
---
buildpack-18/Dockerfile | 2 +-
runtime-18/Dockerfile | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/buildpack-18/Dockerfile b/buildpack-18/Dockerfile
index df36d48..ecf85df 100644
--- a/buildpack-18/Dockerfile
+++ b/buildpack-18/Dockerfile
@@ -14,7 +14,7 @@ RUN set -xe && \
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
apt-get update && \
apt-get install -y --no-install-recommends postgresql-client-11 && \
- if [ $(dpkg --print-architecture) = "arm64" ];then apt-get install -y --no-install-recommends phantomjs; fi && \
+ # if [ $(dpkg --print-architecture) = "arm64" ];then apt-get install -y --no-install-recommends phantomjs; fi && \
rm -rf /var/lib/apt/lists/* && \
# upgrade npm to 6.10
npm i -g npm@9.6.0 && \
diff --git a/runtime-18/Dockerfile b/runtime-18/Dockerfile
index 9c9fdc1..1161797 100644
--- a/runtime-18/Dockerfile
+++ b/runtime-18/Dockerfile
@@ -20,7 +20,7 @@ RUN set -xe && \
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
apt-get update && \
apt-get install -y --no-install-recommends postgresql-client-11 && \
- if [ $(dpkg --print-architecture) = "arm64" ];then apt-get install -y --no-install-recommends phantomjs; fi && \
+ # if [ $(dpkg --print-architecture) = "arm64" ];then apt-get install -y --no-install-recommends phantomjs; fi && \
rm -rf /var/lib/apt/lists/* && \
# install pchecker
wget https://github.com/hackmdio/portchecker/releases/download/${PORTCHECKER_VERSION}/portchecker-linux-$(dpkg --print-architecture).tar.gz && \
@@ -45,4 +45,3 @@ ENV PATH="/home/hackmd/.npm/bin:$PATH"
WORKDIR /home/$USER_NAME/app
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
CMD ["node"]
-