deblan-mirror/nextcloud-spreed-signaling
deblan-mirror/nextcloud-spreed-signaling
1
0
Fork 0
mirror of https://github.com/strukturag/nextcloud-spreed-signaling synced 2024-04-30 04:52:46 +02:00
Code Issues Releases Wiki Activity

Merge pull request #602 from strukturag/docker-version

Browse source 
Include "~docker" in version if built on Docker.
This commit is contained in:
Joachim Bauch 2023-11-15 12:10:09 +01:00 committed by GitHub
parent a2faf3dc95 838e601183
commit 55d143d6bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docker/proxy/Dockerfile
View file

@ -5,7 +5,8 @@ ARG TARGETOS
WORKDIR /workdir
COPY . .
RUN apk add --no-cache bash git build-base protobuf && \
RUN touch /.dockerenv && \
apk add --no-cache bash git build-base protobuf && \
if [ -d "vendor" ]; then GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOPROXY=off make proxy; else \
GOOS=${TARGETOS} GOARCH=${TARGETARCH} make proxy; fi

3
docker/server/Dockerfile
View file

@ -5,7 +5,8 @@ ARG TARGETOS
WORKDIR /workdir
COPY . .
RUN apk add --no-cache bash git build-base protobuf && \
RUN touch /.dockerenv && \
apk add --no-cache bash git build-base protobuf && \
if [ -d "vendor" ]; then GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOPROXY=off make server; else \
GOOS=${TARGETOS} GOARCH=${TARGETARCH} make server; fi

5
scripts/get-version.sh
View file

@ -15,6 +15,11 @@ if [ -z "$VERSION" ] && [ -d "$ROOT/../.git" ]; then
else
VERSION=$(git log -1 --pretty=%H)
fi
if [ -f "/.dockerenv" ]; then
VERSION="$VERSION~docker"
elif grep -sq 'docker\|lxc' /proc/1/cgroup; then
VERSION="$VERSION~docker"
fi
fi
if [ -z "$VERSION" ]; then