Skip to content

Commit 7d6adf3

Browse files
thelamerthelamer
committed
rebase to alpine
1 parent c954d56 commit 7d6adf3

File tree

7 files changed

+49
-68
lines changed

7 files changed

+49
-68
lines changed

‎Dockerfile

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:bionic
1+
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:alpine
22

33
# set version label
44
ARG BUILD_DATE
@@ -7,28 +7,16 @@ ARG SQLITEB_VERSION
77
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
88
LABEL maintainer="aptalca"
99

10+
# title
11+
ENV TITLE=SQLiteBrowser
12+
1013
RUN \
11-
echo "***** add ppa ****" && \
12-
apt-get update && \
13-
apt-get install -y \
14-
gnupg && \
15-
apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 941353830DA80B6A06276736B0C3F48A7F2583EA && \
16-
echo "deb http://ppa.launchpad.net/linuxgndu/sqlitebrowser/ubuntu bionic main" >> /etc/apt/sources.list.d/sqlitebrowser.list && \
17-
echo "deb-src http://ppa.launchpad.net/linuxgndu/sqlitebrowser/ubuntu bionic main" >> /etc/apt/sources.list.d/sqlitebrowser.list && \
18-
if [ -z ${SQLITEB_VERSION+x} ]; then \
19-
SQLITEB_VERSION=$(curl -sX GET http://ppa.launchpad.net/linuxgndu/sqlitebrowser/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c \
20-
|grep -A 7 -m 1 "Package: sqlitebrowser" | awk -F ": " '/Version/{print $2;exit}');\
21-
fi && \
22-
echo "**** install packages ****" && \
23-
apt-get update && \
24-
apt-get install -y \
25-
sqlitebrowser=${SQLITEB_VERSION} && \
26-
echo "**** cleanup ****" && \
27-
apt-get clean && \
28-
rm -rf \
29-
/tmp/* \
30-
/var/lib/apt/lists/* \
31-
/var/tmp/*
14+
echo "**** install packages ****" && \
15+
apk add --no-cache \
16+
sqlitebrowser && \
17+
echo "**** cleanup ****" && \
18+
rm -rf \
19+
/tmp/*
3220

3321
# add local files
3422
COPY /root /

‎Dockerfile.aarch64

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-bionic
1+
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-alpine
22

33
# set version label
44
ARG BUILD_DATE
@@ -7,28 +7,16 @@ ARG SQLITEB_VERSION
77
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
88
LABEL maintainer="aptalca"
99

10+
# title
11+
ENV TITLE=SQLiteBrowser
12+
1013
RUN \
11-
echo "***** add ppa ****" && \
12-
apt-get update && \
13-
apt-get install -y \
14-
gnupg && \
15-
apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 941353830DA80B6A06276736B0C3F48A7F2583EA && \
16-
echo "deb http://ppa.launchpad.net/linuxgndu/sqlitebrowser/ubuntu bionic main" >> /etc/apt/sources.list.d/sqlitebrowser.list && \
17-
echo "deb-src http://ppa.launchpad.net/linuxgndu/sqlitebrowser/ubuntu bionic main" >> /etc/apt/sources.list.d/sqlitebrowser.list && \
18-
if [ -z ${SQLITEB_VERSION+x} ]; then \
19-
SQLITEB_VERSION=$(curl -sX GET http://ppa.launchpad.net/linuxgndu/sqlitebrowser/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c \
20-
|grep -A 7 -m 1 "Package: sqlitebrowser" | awk -F ": " '/Version/{print $2;exit}');\
21-
fi && \
22-
echo "**** install packages ****" && \
23-
apt-get update && \
24-
apt-get install -y \
25-
sqlitebrowser=${SQLITEB_VERSION} && \
26-
echo "**** cleanup ****" && \
27-
apt-get clean && \
28-
rm -rf \
29-
/tmp/* \
30-
/var/lib/apt/lists/* \
31-
/var/tmp/*
14+
echo "**** install packages ****" && \
15+
apk add --no-cache \
16+
sqlitebrowser && \
17+
echo "**** cleanup ****" && \
18+
rm -rf \
19+
/tmp/*
3220

3321
# add local files
3422
COPY /root /

‎Dockerfile.armhf

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-bionic
1+
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-alpine
22

33
# set version label
44
ARG BUILD_DATE
@@ -7,28 +7,16 @@ ARG SQLITEB_VERSION
77
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
88
LABEL maintainer="aptalca"
99

10+
# title
11+
ENV TITLE=SQLiteBrowser
12+
1013
RUN \
11-
echo "***** add ppa ****" && \
12-
apt-get update && \
13-
apt-get install -y \
14-
gnupg && \
15-
apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 941353830DA80B6A06276736B0C3F48A7F2583EA && \
16-
echo "deb http://ppa.launchpad.net/linuxgndu/sqlitebrowser/ubuntu bionic main" >> /etc/apt/sources.list.d/sqlitebrowser.list && \
17-
echo "deb-src http://ppa.launchpad.net/linuxgndu/sqlitebrowser/ubuntu bionic main" >> /etc/apt/sources.list.d/sqlitebrowser.list && \
18-
if [ -z ${SQLITEB_VERSION+x} ]; then \
19-
SQLITEB_VERSION=$(curl -sX GET http://ppa.launchpad.net/linuxgndu/sqlitebrowser/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c \
20-
|grep -A 7 -m 1 "Package: sqlitebrowser" | awk -F ": " '/Version/{print $2;exit}');\
21-
fi && \
22-
echo "**** install packages ****" && \
23-
apt-get update && \
24-
apt-get install -y \
25-
sqlitebrowser=${SQLITEB_VERSION} && \
26-
echo "**** cleanup ****" && \
27-
apt-get clean && \
28-
rm -rf \
29-
/tmp/* \
30-
/var/lib/apt/lists/* \
31-
/var/tmp/*
14+
echo "**** install packages ****" && \
15+
apk add --no-cache \
16+
sqlitebrowser && \
17+
echo "**** cleanup ****" && \
18+
rm -rf \
19+
/tmp/*
3220

3321
# add local files
3422
COPY /root /

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Container images are configured using parameters passed at runtime (such as thos
108108

109109
| Parameter | Function |
110110
| :----: | --- |
111-
| `-p 3000` | Sqlitebrowser desktop gui, only use this if you are not using host mode and sniffing Docker network traffic. |
111+
| `-p 3000` | Sqlitebrowser desktop gui. |
112112
| `-e PUID=1000` | for UserID - see below for explanation |
113113
| `-e PGID=1000` | for GroupID - see below for explanation |
114114
| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London. |
@@ -223,5 +223,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
223223

224224
## Versions
225225

226+
* **16.02.22:** - Rebase to Alpine.
226227
* **20.01.21:** - Remove Wireshark reference.
227228
* **29.07.20:** - Initial release.

‎readme-vars.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ param_volumes:
2828
- { vol_path: "/config", vol_host_path: "/path/to/config", desc: "Users home directory in the container, stores program settings and potentially dump files." }
2929
param_usage_include_ports: true
3030
param_ports:
31-
- { external_port: "3000", internal_port: "3000", port_desc: "Sqlitebrowser desktop gui, only use this if you are not using host mode and sniffing Docker network traffic." }
31+
- { external_port: "3000", internal_port: "3000", port_desc: "Sqlitebrowser desktop gui." }
3232

3333
# application setup block
3434
app_setup_block_enabled: true
@@ -40,5 +40,6 @@ app_setup_block: |
4040
4141
# changelog
4242
changelogs:
43+
- { date: "16.02.22:", desc: "Rebase to Alpine." }
4344
- { date: "20.01.21:", desc: "Remove Wireshark reference." }
4445
- { date: "29.07.20:", desc: "Initial release." }

‎root/defaults/menu.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<openbox_menu xmlns="http://openbox.org/3.4/menu">
3+
<menu id="root-menu" label="MENU">
4+
<item label="xterm" icon="/usr/share/pixmaps/xterm-color_48x48.xpm"><action name="Execute"><command>/usr/bin/xterm</command></action></item>
5+
<item label="SQLite Browser" icon="/usr/share/icons/hicolor/256x256/apps/sqlitebrowser.png"><action name="Execute"><command>/usr/bin/sqlitebrowser</command></action></item>
6+
<item label="Reload OB"><action name="Reconfigure"/></item>
7+
</menu>
8+
</openbox_menu>

‎root/etc/cont-init.d/56-openboxcopy

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/with-contenv bash
2+
3+
# default file copies first run
4+
[[ ! -f /config/.config/openbox/menu.xml ]] && \
5+
mkdir -p /config/.config/openbox && \
6+
cp /defaults/menu.xml /config/.config/openbox/menu.xml && \
7+
chown -R abc:abc /config/.config

0 commit comments

Comments
 (0)