reverting the versioning logic to pull the commit at build time, despite race conditions it is the cleanest way to pull a specific commit from github

This commit is contained in:
thelamer 2019-01-20 01:26:17 -08:00
parent d64da1c97f
commit 4fc239fc80
3 changed files with 3 additions and 36 deletions

View file

@ -3,7 +3,6 @@ FROM lsiobase/alpine.python:3.8
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION ARG VERSION
ARG HEADPHONES_COMMIT
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="sparklyballs" LABEL maintainer="sparklyballs"
@ -15,7 +14,6 @@ RUN \
apk add --no-cache --virtual=build-dependencies \ apk add --no-cache --virtual=build-dependencies \
g++ \ g++ \
gcc \ gcc \
jq \
make && \ make && \
echo "**** install runtime packages ****" && \ echo "**** install runtime packages ****" && \
apk add --no-cache \ apk add --no-cache \
@ -38,16 +36,7 @@ RUN \
make && \ make && \
make install && \ make install && \
echo "**** install app ****" && \ echo "**** install app ****" && \
if [ -z ${HEADPHONES_COMMIT+x} ]; then \ git clone --depth 1 https://github.com/rembo10/headphones.git /app/headphones && \
HEADPHONES_COMMIT=$(curl -sX GET https://api.github.com/repos/rembo10/headphones/commits/master \
| jq -r '. | .sha'); \
fi && \
mkdir -p /app/headphones && \
cd /app/headphones && \
git init && \
git remote add origin https://github.com/rembo10/headphones.git && \
git fetch --depth 1 origin ${HEADPHONES_COMMIT} && \
git checkout FETCH_HEAD && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \
apk del --purge \ apk del --purge \
build-dependencies && \ build-dependencies && \

View file

@ -6,7 +6,6 @@ COPY qemu-aarch64-static /usr/bin
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION ARG VERSION
ARG HEADPHONES_COMMIT
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="sparklyballs" LABEL maintainer="sparklyballs"
@ -18,7 +17,6 @@ RUN \
apk add --no-cache --virtual=build-dependencies \ apk add --no-cache --virtual=build-dependencies \
g++ \ g++ \
gcc \ gcc \
jq \
make && \ make && \
echo "**** install runtime packages ****" && \ echo "**** install runtime packages ****" && \
apk add --no-cache \ apk add --no-cache \
@ -41,16 +39,7 @@ RUN \
make && \ make && \
make install && \ make install && \
echo "**** install app ****" && \ echo "**** install app ****" && \
if [ -z ${HEADPHONES_COMMIT+x} ]; then \ git clone --depth 1 https://github.com/rembo10/headphones.git /app/headphones && \
HEADPHONES_COMMIT=$(curl -sX GET https://api.github.com/repos/rembo10/headphones/commits/master \
| jq -r '. | .sha'); \
fi && \
mkdir -p /app/headphones && \
cd /app/headphones && \
git init && \
git remote add origin https://github.com/rembo10/headphones.git && \
git fetch --depth 1 origin ${HEADPHONES_COMMIT} && \
git checkout FETCH_HEAD && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \
apk del --purge \ apk del --purge \
build-dependencies && \ build-dependencies && \

View file

@ -6,7 +6,6 @@ COPY qemu-arm-static /usr/bin
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION ARG VERSION
ARG HEADPHONES_COMMIT
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="sparklyballs" LABEL maintainer="sparklyballs"
@ -18,7 +17,6 @@ RUN \
apk add --no-cache --virtual=build-dependencies \ apk add --no-cache --virtual=build-dependencies \
g++ \ g++ \
gcc \ gcc \
jq \
make && \ make && \
echo "**** install runtime packages ****" && \ echo "**** install runtime packages ****" && \
apk add --no-cache \ apk add --no-cache \
@ -41,16 +39,7 @@ RUN \
make && \ make && \
make install && \ make install && \
echo "**** install app ****" && \ echo "**** install app ****" && \
if [ -z ${HEADPHONES_COMMIT+x} ]; then \ git clone --depth 1 https://github.com/rembo10/headphones.git /app/headphones && \
HEADPHONES_COMMIT=$(curl -sX GET https://api.github.com/repos/rembo10/headphones/commits/master \
| jq -r '. | .sha'); \
fi && \
mkdir -p /app/headphones && \
cd /app/headphones && \
git init && \
git remote add origin https://github.com/rembo10/headphones.git && \
git fetch --depth 1 origin ${HEADPHONES_COMMIT} && \
git checkout FETCH_HEAD && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \
apk del --purge \ apk del --purge \
build-dependencies && \ build-dependencies && \