Align builds with addon version

This commit is contained in:
Alexandre
2021-01-15 18:54:50 +01:00
parent 736c6dd78b
commit 816b76c2a8
12 changed files with 54 additions and 51 deletions

View File

@@ -1,16 +1,18 @@
ARG BUILD_FROM ARG BUILD_FROM
FROM $BUILD_FROM ARG BUILD_VERSION
FROM ${BUILD_FROM}-${BUILD_VERSION}
# Install bashio # Install bashio
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
jq \ jq \
&& curl -J -L -o /tmp/bashio.tar.gz \ && curl -J -L -o /tmp/bashio.tar.gz \
"https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \ "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \
&& mkdir /tmp/bashio \ && mkdir /tmp/bashio \
&& tar zxvf \ && tar zxvf \
/tmp/bashio.tar.gz \ /tmp/bashio.tar.gz \
--strip 1 -C /tmp/bashio \ --strip 1 -C /tmp/bashio \
\ \
&& mv /tmp/bashio/lib /usr/lib/bashio \ && mv /tmp/bashio/lib /usr/lib/bashio \
&& ln -s /usr/lib/bashio/bashio /usr/bin/bashio && ln -s /usr/lib/bashio/bashio /usr/bin/bashio

View File

@@ -1,9 +1,9 @@
{ {
"build_from": { "build_from": {
"armv7": "linuxserver/code-server:arm32v7-v3.8.0-ls64", "armv7": "linuxserver/code-server:arm32v7",
"armhf": "linuxserver/code-server:arm32v7-v3.8.0-ls64", "armhf": "linuxserver/code-server:arm32v7",
"aarch64": "linuxserver/code-server:arm64v8-v3.8.0-ls64", "aarch64": "linuxserver/code-server:arm64v8",
"amd64": "linuxserver/code-server:amd64-v3.8.0-ls64" "amd64": "linuxserver/code-server:amd64"
}, },
"squash": false, "squash": false,
"args": {} "args": {}

View File

@@ -1,16 +1,18 @@
ARG BUILD_FROM ARG BUILD_FROM
FROM $BUILD_FROM ARG BUILD_VERSION
FROM ${BUILD_FROM}-${BUILD_VERSION}
# Install bashio # Install bashio
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
jq \ jq \
&& curl -J -L -o /tmp/bashio.tar.gz \ && curl -J -L -o /tmp/bashio.tar.gz \
"https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \ "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \
&& mkdir /tmp/bashio \ && mkdir /tmp/bashio \
&& tar zxvf \ && tar zxvf \
/tmp/bashio.tar.gz \ /tmp/bashio.tar.gz \
--strip 1 -C /tmp/bashio \ --strip 1 -C /tmp/bashio \
\ \
&& mv /tmp/bashio/lib /usr/lib/bashio \ && mv /tmp/bashio/lib /usr/lib/bashio \
&& ln -s /usr/lib/bashio/bashio /usr/bin/bashio && ln -s /usr/lib/bashio/bashio /usr/bin/bashio

View File

@@ -1,9 +1,9 @@
{ {
"build_from": { "build_from": {
"armv7": "linuxserver/doublecommander:arm32v7-0.8.2-1-ls38", "armv7": "linuxserver/doublecommander:arm32v7",
"armhf": "linuxserver/doublecommander:arm32v7-0.8.2-1-ls38", "armhf": "linuxserver/doublecommander:arm32v7",
"aarch64": "linuxserver/doublecommander:arm64v8-0.8.2-1-ls38", "aarch64": "linuxserver/doublecommander:arm64v8",
"amd64": "linuxserver/doublecommander:amd64-0.8.2-1-ls38" "amd64": "linuxserver/doublecommander:amd64"
}, },
"squash": false, "squash": false,
"args": {} "args": {}

View File

@@ -1,6 +1,7 @@
ARG BUILD_FROM ARG BUILD_FROM
# hadolint ignore=DL3006 ARG BUILD_VERSION
FROM $BUILD_FROM
FROM ${BUILD_FROM}-${BUILD_VERSION}
# Set shell # Set shell
SHELL ["/bin/bash", "-o", "pipefail", "-c"] SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -8,22 +9,22 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN apt-get update \ RUN apt-get update \
\ \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
jq \ jq \
\ \
&& apt-get -y upgrade cifs-utils \ && apt-get -y upgrade cifs-utils \
&& curl -J -L -o /tmp/bashio.tar.gz \ && curl -J -L -o /tmp/bashio.tar.gz \
"https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \ "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \
&& mkdir /tmp/bashio \ && mkdir /tmp/bashio \
&& tar zxvf \ && tar zxvf \
/tmp/bashio.tar.gz \ /tmp/bashio.tar.gz \
--strip 1 -C /tmp/bashio \ --strip 1 -C /tmp/bashio \
\ \
&& mv /tmp/bashio/lib /usr/lib/bashio \ && mv /tmp/bashio/lib /usr/lib/bashio \
&& ln -s /usr/lib/bashio/bashio /usr/bin/bashio \ && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
&& rm -fr \ && rm -fr \
/tmp/* \ /tmp/* \
/var/{cache,log}/* \ /var/{cache,log}/* \
/var/lib/apt/lists/* /var/lib/apt/lists/*
RUN sed -i "s|/config|/emby|g" /etc/services.d/emby/run \ RUN sed -i "s|/config|/emby|g" /etc/services.d/emby/run \
&& sed -i "s|/config|/emby|g" /etc/cont-init.d/30-config && sed -i "s|/config|/emby|g" /etc/cont-init.d/30-config

View File

@@ -1,9 +1,9 @@
{ {
"build_from": { "build_from": {
"armv7": "linuxserver/emby:arm32v7-beta-version-4.6.0.10", "armv7": "linuxserver/emby:arm32v7",
"armhf": "linuxserver/emby:arm32v7-beta-version-4.6.0.10", "armhf": "linuxserver/emby:arm32v7",
"aarch64": "linuxserver/emby:arm64v8-beta-version-4.6.0.10", "aarch64": "linuxserver/emby:arm64v8",
"amd64": "linuxserver/emby:amd64-beta-version-4.6.0.10" "amd64": "linuxserver/emby:amd64"
}, },
"squash": false, "squash": false,
"args": {} "args": {}

View File

@@ -1,6 +1,6 @@
{ {
"name": "Emby beta NAS", "name": "Emby beta NAS",
"version": "4.6.0.10", "version": "beta-version-4.6.0.10",
"slug": "emby_nas", "slug": "emby_nas",
"legacy": false, "legacy": false,
"maintenance": { "maintenance": {

View File

@@ -1,6 +1,7 @@
ARG BUILD_FROM ARG BUILD_FROM
ARG BUILD_VERSION
FROM ${BUILD_FROM} FROM ${BUILD_FROM}-${BUILD_VERSION}
ENV NEXTCLOUD_PATH="/data/config/www/nextcloud" ENV NEXTCLOUD_PATH="/data/config/www/nextcloud"

View File

@@ -1,10 +1,10 @@
{ {
"squash": false, "squash": false,
"build_from": { "build_from": {
"aarch64": "linuxserver/nextcloud:arm64v8-version-20.0.4", "aarch64": "linuxserver/nextcloud:arm64v8",
"amd64": "linuxserver/nextcloud:amd64-version-20.0.4", "amd64": "linuxserver/nextcloud:amd64",
"armhf": "linuxserver/nextcloud:arm32v7-version-20.0.4", "armhf": "linuxserver/nextcloud:arm32v7",
"armv7": "linuxserver/nextcloud:arm32v7-version-20.0.4" "armv7": "linuxserver/nextcloud:arm32v7"
}, },
"args": {} "args": {}
} }

View File

@@ -1,13 +1,14 @@
ARG BUILD_FROM ARG BUILD_FROM
# hadolint ignore=DL3006 ARG BUILD_VERSION
FROM $BUILD_FROM
FROM ${BUILD_FROM}-${BUILD_VERSION}
RUN curl -J -L -o /tmp/bashio.tar.gz \ RUN curl -J -L -o /tmp/bashio.tar.gz \
"https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \ "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \
&& mkdir /tmp/bashio \ && mkdir /tmp/bashio \
&& tar zxvf \ && tar zxvf \
/tmp/bashio.tar.gz \ /tmp/bashio.tar.gz \
--strip 1 -C /tmp/bashio \ --strip 1 -C /tmp/bashio \
\ \
&& mv /tmp/bashio/lib /usr/lib/bashio \ && mv /tmp/bashio/lib /usr/lib/bashio \
&& ln -s /usr/lib/bashio/bashio /usr/bin/bashio \ && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \

View File

@@ -1,13 +1,9 @@
{ {
"build_from_template": {
"image": "linuxserver/radarr",
"version": "v0.2.0.1504-ls68"
},
"build_from": { "build_from": {
"armhf": "linuxserver/radarr:armhf-v0.2.0.1504-ls68", "armhf": "linuxserver/radarr:arm32v7",
"armv7": "linuxserver/radarr:arm32v7-v0.2.0.1504-ls68", "armv7": "linuxserver/radarr:arm32v7",
"aarch64": "linuxserver/radarr:arm64v8-v0.2.0.1504-ls68", "aarch64": "linuxserver/radarr:arm64v8",
"amd64": "linuxserver/radarr:amd64-v0.2.0.1504-ls68" "amd64": "linuxserver/radarr:amd64"
}, },
"squash": false, "squash": false,
"args": {} "args": {}

View File

@@ -1,6 +1,6 @@
{ {
"name": "radarr NAS", "name": "radarr NAS",
"version": "1.0", "version": "v0.2.0.1504-ls68",
"slug": "radarr_nas", "slug": "radarr_nas",
"legacy": false, "legacy": false,
"maintenance": { "maintenance": {