From 7d6adf39a817ea65f119b3a602e7cf3c683e06db Mon Sep 17 00:00:00 2001 From: thelamer Date: Wed, 16 Feb 2022 20:30:11 -0800 Subject: [PATCH] rebase to alpine --- Dockerfile | 32 +++++++++-------------------- Dockerfile.aarch64 | 32 +++++++++-------------------- Dockerfile.armhf | 32 +++++++++-------------------- README.md | 3 ++- readme-vars.yml | 3 ++- root/defaults/menu.xml | 8 ++++++++ root/etc/cont-init.d/56-openboxcopy | 7 +++++++ 7 files changed, 49 insertions(+), 68 deletions(-) create mode 100644 root/defaults/menu.xml create mode 100644 root/etc/cont-init.d/56-openboxcopy diff --git a/Dockerfile b/Dockerfile index cb20bce..3669a54 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 74acdbb..d54ede5 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -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 / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 8b17706..7dcf9d2 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -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 / diff --git a/README.md b/README.md index 8b1e4b0..6c3d2fb 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/readme-vars.yml b/readme-vars.yml index 6afe5a7..b9b76b9 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -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." } diff --git a/root/defaults/menu.xml b/root/defaults/menu.xml new file mode 100644 index 0000000..92ca2e3 --- /dev/null +++ b/root/defaults/menu.xml @@ -0,0 +1,8 @@ + + + +/usr/bin/xterm +/usr/bin/sqlitebrowser + + + diff --git a/root/etc/cont-init.d/56-openboxcopy b/root/etc/cont-init.d/56-openboxcopy new file mode 100644 index 0000000..f22df65 --- /dev/null +++ b/root/etc/cont-init.d/56-openboxcopy @@ -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