Skip to content
This repository was archived by the owner on Apr 25, 2023. It is now read-only.

Commit 4796a24

Browse files
committed
adding changes to support the web file explorer
1 parent 03df114 commit 4796a24

File tree

4 files changed

+27
-15
lines changed

4 files changed

+27
-15
lines changed

Dockerfile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,15 @@ RUN \
6868
apt-get install -y \
6969
gnupg && \
7070
curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
71-
echo 'deb https://deb.nodesource.com/node_12.x bionic main' \
71+
echo 'deb https://deb.nodesource.com/node_14.x bionic main' \
7272
> /etc/apt/sources.list.d/nodesource.list && \
7373
apt-get update && \
7474
apt-get install -y \
75-
nodejs
75+
g++ \
76+
gcc \
77+
libpam0g-dev \
78+
make \
79+
nodejs
7680

7781
RUN \
7882
echo "**** grab source ****" && \
@@ -83,7 +87,7 @@ RUN \
8387
fi && \
8488
curl -o \
8589
/tmp/gclient.tar.gz -L \
86-
"https://github.com/linuxserver/gclient/archive/${GCLIENT_RELEASE}.tar.gz" && \
90+
"https://github.com/linuxserver/gclient/archive/file-explorer.tar.gz" && \
8791
tar xf \
8892
/tmp/gclient.tar.gz -C \
8993
/gclient/ --strip-components=1
@@ -116,7 +120,7 @@ RUN \
116120
apt-get install -y \
117121
gnupg && \
118122
curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
119-
echo 'deb https://deb.nodesource.com/node_12.x bionic main' \
123+
echo 'deb https://deb.nodesource.com/node_14.x bionic main' \
120124
> /etc/apt/sources.list.d/nodesource.list && \
121125
apt-get update && \
122126
DEBIAN_FRONTEND=noninteractive \

Dockerfile.aarch64

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ RUN \
5959
/tmp/out/guacd_${GUACD_VERSION}.deb
6060

6161
# nodejs builder
62-
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic as nodebuilder
62+
FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic as nodebuilder
6363
ARG GCLIENT_RELEASE
6464

6565
RUN \
@@ -68,11 +68,15 @@ RUN \
6868
apt-get install -y \
6969
gnupg && \
7070
curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
71-
echo 'deb https://deb.nodesource.com/node_12.x bionic main' \
71+
echo 'deb https://deb.nodesource.com/node_14.x bionic main' \
7272
> /etc/apt/sources.list.d/nodesource.list && \
7373
apt-get update && \
7474
apt-get install -y \
75-
nodejs
75+
g++ \
76+
gcc \
77+
libpam0g-dev \
78+
make \
79+
nodejs
7680

7781
RUN \
7882
echo "**** grab source ****" && \
@@ -83,7 +87,7 @@ RUN \
8387
fi && \
8488
curl -o \
8589
/tmp/gclient.tar.gz -L \
86-
"https://github.com/linuxserver/gclient/archive/${GCLIENT_RELEASE}.tar.gz" && \
90+
"https://github.com/linuxserver/gclient/archive/file-explorer.tar.gz" && \
8791
tar xf \
8892
/tmp/gclient.tar.gz -C \
8993
/gclient/ --strip-components=1
@@ -116,7 +120,7 @@ RUN \
116120
apt-get install -y \
117121
gnupg && \
118122
curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
119-
echo 'deb https://deb.nodesource.com/node_12.x bionic main' \
123+
echo 'deb https://deb.nodesource.com/node_14.x bionic main' \
120124
> /etc/apt/sources.list.d/nodesource.list && \
121125
apt-get update && \
122126
DEBIAN_FRONTEND=noninteractive \

Dockerfile.armhf

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,15 @@ RUN \
6868
apt-get install -y \
6969
gnupg && \
7070
curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
71-
echo 'deb https://deb.nodesource.com/node_12.x bionic main' \
71+
echo 'deb https://deb.nodesource.com/node_14.x bionic main' \
7272
> /etc/apt/sources.list.d/nodesource.list && \
7373
apt-get update && \
7474
apt-get install -y \
75-
nodejs
75+
g++ \
76+
gcc \
77+
libpam0g-dev \
78+
make \
79+
nodejs
7680

7781
RUN \
7882
echo "**** grab source ****" && \
@@ -83,7 +87,7 @@ RUN \
8387
fi && \
8488
curl -o \
8589
/tmp/gclient.tar.gz -L \
86-
"https://github.com/linuxserver/gclient/archive/${GCLIENT_RELEASE}.tar.gz" && \
90+
"https://github.com/linuxserver/gclient/archive/file-explorer.tar.gz" && \
8791
tar xf \
8892
/tmp/gclient.tar.gz -C \
8993
/gclient/ --strip-components=1
@@ -94,7 +98,7 @@ RUN \
9498
npm install
9599

96100
# runtime stage
97-
FROM ghcr.io/linuxserver/baseimage-rdesktop:arm32v7-bionic
101+
FROM ghcr.io/linuxserver/baseimage-rdesktop:bionic
98102

99103
# set version label
100104
ARG BUILD_DATE
@@ -116,7 +120,7 @@ RUN \
116120
apt-get install -y \
117121
gnupg && \
118122
curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
119-
echo 'deb https://deb.nodesource.com/node_12.x bionic main' \
123+
echo 'deb https://deb.nodesource.com/node_14.x bionic main' \
120124
> /etc/apt/sources.list.d/nodesource.list && \
121125
apt-get update && \
122126
DEBIAN_FRONTEND=noninteractive \

root/etc/services.d/web/run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/with-contenv bash
22

33
cd /gclient || exit
4-
exec \
4+
HOME="/config" exec \
55
s6-setuidgid abc node app.js

0 commit comments

Comments
 (0)