aljaz/signal-cli-rest-api
1
0
Fork 0
mirror of https://github.com/aljazceru/signal-cli-rest-api.git synced 2025-12-19 15:44:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

set version during build process

Browse Source 
see #47
This commit is contained in:
Bernhard B
2022-01-01 14:53:18 +01:00
parent 259e1ece8e
commit 18dcc49ff4
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/release-dev-version.yml vendored
View File

@@ -38,4 +38,4 @@ jobs:
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
docker buildx create --name multibuilder docker buildx create --name multibuilder
docker buildx use multibuilder docker buildx use multibuilder
docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t bbernhard/signal-cli-rest-api:${VERSION}-dev -t bbernhard/signal-cli-rest-api:latest-dev . --push docker buildx build --build-arg BUILD_VERSION_ARG=${VERSION} --platform linux/amd64,linux/arm64,linux/arm/v7 -t bbernhard/signal-cli-rest-api:${VERSION}-dev -t bbernhard/signal-cli-rest-api:latest-dev . --push

2
.github/workflows/release-productive-version.yml vendored
View File

@@ -38,4 +38,4 @@ jobs:
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
docker buildx create --name multibuilder docker buildx create --name multibuilder
docker buildx use multibuilder docker buildx use multibuilder
docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t bbernhard/signal-cli-rest-api:${VERSION} -t bbernhard/signal-cli-rest-api:latest . --push docker buildx build --build-arg BUILD_VERSION_ARG=${VERSION} --platform linux/amd64,linux/arm64,linux/arm/v7 -t bbernhard/signal-cli-rest-api:${VERSION} -t bbernhard/signal-cli-rest-api:latest . --push

6
Dockerfile
View File

@@ -5,6 +5,8 @@ ARG SWAG_VERSION=1.6.7
ARG GRAALVM_JAVA_VERSION=17 ARG GRAALVM_JAVA_VERSION=17
ARG GRAALVM_VERSION=21.3.0 ARG GRAALVM_VERSION=21.3.0
ARG BUILD_VERSION_ARG=unset
FROM golang:1.17-bullseye AS buildcontainer FROM golang:1.17-bullseye AS buildcontainer
ARG SIGNAL_CLI_VERSION ARG SIGNAL_CLI_VERSION
@@ -12,6 +14,7 @@ ARG LIBSIGNAL_CLIENT_VERSION
ARG SWAG_VERSION ARG SWAG_VERSION
ARG GRAALVM_JAVA_VERSION ARG GRAALVM_JAVA_VERSION
ARG GRAALVM_VERSION ARG GRAALVM_VERSION
ARG BUILD_VERSION_ARG
COPY ext/libraries/libsignal-client/v${LIBSIGNAL_CLIENT_VERSION} /tmp/libsignal-client-libraries COPY ext/libraries/libsignal-client/v${LIBSIGNAL_CLIENT_VERSION} /tmp/libsignal-client-libraries
@@ -117,6 +120,9 @@ ENV GIN_MODE=release
ENV PORT=8080 ENV PORT=8080
ARG SIGNAL_CLI_VERSION ARG SIGNAL_CLI_VERSION
ARG BUILD_VERSION_ARG
ENV BUILD_VERSION=$BUILD_VERSION_ARG
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends util-linux supervisor netcat unzip \ && apt-get install -y --no-install-recommends util-linux supervisor netcat unzip \

4
src/client/client.go
View File

@@ -119,6 +119,7 @@ type About struct {
SupportedApiVersions []string `json:"versions"` SupportedApiVersions []string `json:"versions"`
BuildNr int `json:"build"` BuildNr int `json:"build"`
Mode string `json:"mode"` Mode string `json:"mode"`
Version string `json:"version"`
} }
func cleanupTmpFiles(paths []string) { func cleanupTmpFiles(paths []string) {
@@ -463,7 +464,8 @@ func (s *SignalClient) send(number string, message string,
} }
func (s *SignalClient) About() About { func (s *SignalClient) About() About {
about := About{SupportedApiVersions: []string{"v1", "v2"}, BuildNr: 2, Mode: getSignalCliModeString(s.signalCliMode)} about := About{SupportedApiVersions: []string{"v1", "v2"}, BuildNr: 2, Mode: getSignalCliModeString(s.signalCliMode),
Version: utils.GetEnv("BUILD_VERSION", "unset")}
return about return about
} }