Skip to content
This repository was archived by the owner on Feb 16, 2021. It is now read-only.

Commit 167d98b

Browse files
committed
Fix issue with Buster base image and add support for arm64
- replace `libgnome-keyring` with `libsecret` - add dockerfile targeting arm64 Signed-off-by: Rahul Thakoor <rahul@balena.io>
1 parent 7385abc commit 167d98b

File tree

2 files changed

+86
-3
lines changed

2 files changed

+86
-3
lines changed

Dockerfile.aarch64

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
###
2+
# Build stage
3+
##
4+
FROM balenalib/raspberrypi3-node:10-build as build
5+
6+
# Move to app dir
7+
WORKDIR /usr/src/app
8+
9+
# Install build dependencies
10+
RUN install_packages \
11+
apt-utils \
12+
clang \
13+
libxcb-image0 \
14+
libxcb-util0 \
15+
xdg-utils \
16+
libdbus-1-dev \
17+
libgtk2.0-dev \
18+
libnotify-dev \
19+
libsecret-1-0 \
20+
libgconf2-dev \
21+
libasound2-dev \
22+
libcap-dev \
23+
libcups2-dev \
24+
libxtst-dev \
25+
libxss1 \
26+
libnss3-dev \
27+
libsmbclient \
28+
libssh-4 \
29+
libexpat-dev
30+
31+
# Move package.json to filesystem
32+
COPY ./app/package.json .
33+
34+
# Install npm modules for the application
35+
RUN JOBS=MAX npm install --unsafe-perm --production \
36+
&& node_modules/.bin/electron-rebuild
37+
38+
39+
###
40+
# Runtime
41+
##
42+
FROM balenalib/raspberrypi3-node:10-run
43+
44+
# Move to app dir
45+
WORKDIR /usr/src/app
46+
47+
# Install runtime dependencies
48+
RUN install_packages \
49+
xserver-xorg-core \
50+
xserver-xorg-input-all \
51+
xserver-xorg-video-fbdev \
52+
xorg \
53+
libxcb-image0 \
54+
libxcb-util0 \
55+
xdg-utils \
56+
libdbus-1-3 \
57+
libgtk2.0 \
58+
libnotify4 \
59+
libsecret-1-0 \
60+
libgconf-2-4 \
61+
libasound2 \
62+
libcap2 \
63+
libcups2 \
64+
libxtst6 \
65+
libxss1 \
66+
libnss3 \
67+
libsmbclient \
68+
libssh-4 \
69+
fbset \
70+
libexpat1
71+
72+
RUN echo "#!/bin/bash" > /etc/X11/xinit/xserverrc \
73+
&& echo "" >> /etc/X11/xinit/xserverrc \
74+
&& echo 'exec /usr/bin/X -s 0 dpms -nocursor -nolisten tcp "$@"' >> /etc/X11/xinit/xserverrc
75+
76+
# Move app to filesystem
77+
COPY ./app ./
78+
79+
# Copy the modules from the build step
80+
COPY --from=build /usr/src/app/node_modules ./node_modules
81+
82+
# Start app
83+
CMD ["bash", "/usr/src/app/start.sh"]

Dockerfile.template

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RUN install_packages \
1616
libdbus-1-dev \
1717
libgtk2.0-dev \
1818
libnotify-dev \
19-
libgnome-keyring-dev \
19+
libsecret-1-0 \
2020
libgconf2-dev \
2121
libasound2-dev \
2222
libcap-dev \
@@ -33,7 +33,7 @@ COPY ./app/package.json .
3333

3434
# Install npm modules for the application
3535
RUN JOBS=MAX npm install --unsafe-perm --production \
36-
&& node_modules/.bin/electron-rebuild
36+
&& node_modules/.bin/electron-rebuild
3737

3838

3939
###
@@ -56,7 +56,7 @@ RUN install_packages \
5656
libdbus-1-3 \
5757
libgtk2.0 \
5858
libnotify4 \
59-
libgnome-keyring0 \
59+
libsecret-1-0 \
6060
libgconf-2-4 \
6161
libasound2 \
6262
libcap2 \

0 commit comments

Comments
 (0)