rebase to alpine

This commit is contained in:
thelamer 2022-02-16 20:30:11 -08:00
parent c954d56dfc
commit 7d6adf39a8
7 changed files with 49 additions and 68 deletions

View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:bionic
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:alpine
# set version label
ARG BUILD_DATE
@ -7,28 +7,16 @@ ARG SQLITEB_VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="aptalca"
# title
ENV TITLE=SQLiteBrowser
RUN \
echo "***** add ppa ****" && \
apt-get update && \
apt-get install -y \
gnupg && \
apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 941353830DA80B6A06276736B0C3F48A7F2583EA && \
echo "deb http://ppa.launchpad.net/linuxgndu/sqlitebrowser/ubuntu bionic main" >> /etc/apt/sources.list.d/sqlitebrowser.list && \
echo "deb-src http://ppa.launchpad.net/linuxgndu/sqlitebrowser/ubuntu bionic main" >> /etc/apt/sources.list.d/sqlitebrowser.list && \
if [ -z ${SQLITEB_VERSION+x} ]; then \
SQLITEB_VERSION=$(curl -sX GET http://ppa.launchpad.net/linuxgndu/sqlitebrowser/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c \
|grep -A 7 -m 1 "Package: sqlitebrowser" | awk -F ": " '/Version/{print $2;exit}');\
fi && \
echo "**** install packages ****" && \
apt-get update && \
apt-get install -y \
sqlitebrowser=${SQLITEB_VERSION} && \
echo "**** cleanup ****" && \
apt-get clean && \
rm -rf \
/tmp/* \
/var/lib/apt/lists/* \
/var/tmp/*
echo "**** install packages ****" && \
apk add --no-cache \
sqlitebrowser && \
echo "**** cleanup ****" && \
rm -rf \
/tmp/*
# add local files
COPY /root /

View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-bionic
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-alpine
# set version label
ARG BUILD_DATE
@ -7,28 +7,16 @@ ARG SQLITEB_VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="aptalca"
# title
ENV TITLE=SQLiteBrowser
RUN \
echo "***** add ppa ****" && \
apt-get update && \
apt-get install -y \
gnupg && \
apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 941353830DA80B6A06276736B0C3F48A7F2583EA && \
echo "deb http://ppa.launchpad.net/linuxgndu/sqlitebrowser/ubuntu bionic main" >> /etc/apt/sources.list.d/sqlitebrowser.list && \
echo "deb-src http://ppa.launchpad.net/linuxgndu/sqlitebrowser/ubuntu bionic main" >> /etc/apt/sources.list.d/sqlitebrowser.list && \
if [ -z ${SQLITEB_VERSION+x} ]; then \
SQLITEB_VERSION=$(curl -sX GET http://ppa.launchpad.net/linuxgndu/sqlitebrowser/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c \
|grep -A 7 -m 1 "Package: sqlitebrowser" | awk -F ": " '/Version/{print $2;exit}');\
fi && \
echo "**** install packages ****" && \
apt-get update && \
apt-get install -y \
sqlitebrowser=${SQLITEB_VERSION} && \
echo "**** cleanup ****" && \
apt-get clean && \
rm -rf \
/tmp/* \
/var/lib/apt/lists/* \
/var/tmp/*
echo "**** install packages ****" && \
apk add --no-cache \
sqlitebrowser && \
echo "**** cleanup ****" && \
rm -rf \
/tmp/*
# add local files
COPY /root /

View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-bionic
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-alpine
# set version label
ARG BUILD_DATE
@ -7,28 +7,16 @@ ARG SQLITEB_VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="aptalca"
# title
ENV TITLE=SQLiteBrowser
RUN \
echo "***** add ppa ****" && \
apt-get update && \
apt-get install -y \
gnupg && \
apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 941353830DA80B6A06276736B0C3F48A7F2583EA && \
echo "deb http://ppa.launchpad.net/linuxgndu/sqlitebrowser/ubuntu bionic main" >> /etc/apt/sources.list.d/sqlitebrowser.list && \
echo "deb-src http://ppa.launchpad.net/linuxgndu/sqlitebrowser/ubuntu bionic main" >> /etc/apt/sources.list.d/sqlitebrowser.list && \
if [ -z ${SQLITEB_VERSION+x} ]; then \
SQLITEB_VERSION=$(curl -sX GET http://ppa.launchpad.net/linuxgndu/sqlitebrowser/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c \
|grep -A 7 -m 1 "Package: sqlitebrowser" | awk -F ": " '/Version/{print $2;exit}');\
fi && \
echo "**** install packages ****" && \
apt-get update && \
apt-get install -y \
sqlitebrowser=${SQLITEB_VERSION} && \
echo "**** cleanup ****" && \
apt-get clean && \
rm -rf \
/tmp/* \
/var/lib/apt/lists/* \
/var/tmp/*
echo "**** install packages ****" && \
apk add --no-cache \
sqlitebrowser && \
echo "**** cleanup ****" && \
rm -rf \
/tmp/*
# add local files
COPY /root /

View File

@ -108,7 +108,7 @@ Container images are configured using parameters passed at runtime (such as thos
| Parameter | Function |
| :----: | --- |
| `-p 3000` | Sqlitebrowser desktop gui, only use this if you are not using host mode and sniffing Docker network traffic. |
| `-p 3000` | Sqlitebrowser desktop gui. |
| `-e PUID=1000` | for UserID - see below for explanation |
| `-e PGID=1000` | for GroupID - see below for explanation |
| `-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
## Versions
* **16.02.22:** - Rebase to Alpine.
* **20.01.21:** - Remove Wireshark reference.
* **29.07.20:** - Initial release.

View File

@ -28,7 +28,7 @@ param_volumes:
- { vol_path: "/config", vol_host_path: "/path/to/config", desc: "Users home directory in the container, stores program settings and potentially dump files." }
param_usage_include_ports: true
param_ports:
- { 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." }
- { external_port: "3000", internal_port: "3000", port_desc: "Sqlitebrowser desktop gui." }
# application setup block
app_setup_block_enabled: true
@ -40,5 +40,6 @@ app_setup_block: |
# changelog
changelogs:
- { date: "16.02.22:", desc: "Rebase to Alpine." }
- { date: "20.01.21:", desc: "Remove Wireshark reference." }
- { date: "29.07.20:", desc: "Initial release." }

8
root/defaults/menu.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<openbox_menu xmlns="http://openbox.org/3.4/menu">
<menu id="root-menu" label="MENU">
<item label="xterm" icon="/usr/share/pixmaps/xterm-color_48x48.xpm"><action name="Execute"><command>/usr/bin/xterm</command></action></item>
<item label="SQLite Browser" icon="/usr/share/icons/hicolor/256x256/apps/sqlitebrowser.png"><action name="Execute"><command>/usr/bin/sqlitebrowser</command></action></item>
<item label="Reload OB"><action name="Reconfigure"/></item>
</menu>
</openbox_menu>

View File

@ -0,0 +1,7 @@
#!/usr/bin/with-contenv bash
# default file copies first run
[[ ! -f /config/.config/openbox/menu.xml ]] && \
mkdir -p /config/.config/openbox && \
cp /defaults/menu.xml /config/.config/openbox/menu.xml && \
chown -R abc:abc /config/.config