From 60853fbf6a67b19bc70babf6917037fd37f67c2b Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Wed, 9 Oct 2024 11:16:25 -0400 Subject: [PATCH] fix Dockerfile formatting --- Dockerfile | 3 +++ Dockerfile.aarch64 | 27 +++++++++++++++------------ README.md | 4 ++-- readme-vars.yml | 11 +++-------- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/Dockerfile b/Dockerfile index dad1c8b..6b3d6e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,5 @@ +# syntax=docker/dockerfile:1 + FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbookworm # set version label @@ -26,6 +28,7 @@ RUN \ "https://github.com/KRTirtho/spotube/releases/download/${SPOTUBE_VERSION}/Spotube-linux-x86_64.deb" && \ apt install -y --no-install-recommends \ /tmp/spotube.deb && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apt-get autoclean && \ rm -rf \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 657cd01..d4f3ca6 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,3 +1,5 @@ +# syntax=docker/dockerfile:1 + FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-debianbookworm # set version label @@ -11,24 +13,25 @@ LABEL maintainer="thelamer" ENV TITLE=Spotube RUN \ - echo "**** add icon ****" && \ - curl -o \ + echo "**** add icon ****" && \ + curl -o \ /kclient/public/icon.png \ https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/spotube-logo.png && \ - echo "**** install packages ****" && \ - apt-get update && \ - if [ -z ${SPOTUBE_VERSION+x} ]; then \ + echo "**** install packages ****" && \ + apt-get update && \ + if [ -z ${SPOTUBE_VERSION+x} ]; then \ SPOTUBE_VERSION=$(curl -sX GET "https://api.github.com/repos/KRTirtho/spotube/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ + | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ /tmp/spotube.deb -L \ "https://github.com/KRTirtho/spotube/releases/download/${SPOTUBE_VERSION}/Spotube-linux-aarch64.deb" && \ - apt install -y --no-install-recommends \ + apt install -y --no-install-recommends \ /tmp/spotube.deb && \ - echo "**** cleanup ****" && \ - apt-get autoclean && \ - rm -rf \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ + echo "**** cleanup ****" && \ + apt-get autoclean && \ + rm -rf \ /config/.cache \ /var/lib/apt/lists/* \ /var/tmp/* \ diff --git a/README.md b/README.md index 7cdf604..142b9e5 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ services: - PGID=1000 - TZ=Etc/UTC volumes: - - /path/to/config:/config + - /path/to/spotube/config:/config ports: - 3000:3000 - 3001:3001 @@ -144,7 +144,7 @@ docker run -d \ -e TZ=Etc/UTC \ -p 3000:3000 \ -p 3001:3001 \ - -v /path/to/config:/config \ + -v /path/to/spotube/config:/config \ --restart unless-stopped \ lscr.io/linuxserver/spotube:latest ``` diff --git a/readme-vars.yml b/readme-vars.yml index d88f1cb..95fd315 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -14,18 +14,13 @@ available_architectures: - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest" } - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest" } -# development version -development_versions: false - # container parameters common_param_env_vars_enabled: true param_container_name: "{{ project_name }}" -param_usage_include_env: true -param_env_vars: - - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." } + param_usage_include_vols: true param_volumes: - - { vol_path: "/config", vol_host_path: "/path/to/config", desc: "Users home directory in the container, stores local files and settings" } + - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Users home directory in the container, stores local files and settings" } param_usage_include_ports: true param_ports: - { external_port: "3000", internal_port: "3000", port_desc: "Spotube desktop gui." } @@ -89,4 +84,4 @@ app_setup_block: | # changelog changelogs: - { date: "09.10.24:", desc: "Add aarch64 support." } - - { date: "26.04.24:", desc: "Initial release." } \ No newline at end of file + - { date: "26.04.24:", desc: "Initial release." }