signald/infrastructure
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix version tagging

Browse source
This commit is contained in:
Finn 2019-10-16 21:31:23 -07:00
parent bd89a8b1fb
commit 06cd7899ad
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -5,7 +5,7 @@ build:signal-server:
stage: build stage: build
script: script:
- docker build -f signal-server.Dockerfile -t ${CI_REGISTRY_IMAGE}/signal-server:${CI_COMMIT_SHA:0:8} . - docker build -f signal-server.Dockerfile -t ${CI_REGISTRY_IMAGE}/signal-server:${CI_COMMIT_SHA:0:8} .
- export VERSION=$(docker run ${CI_REGISTRY_IMAGE}/signal-server:${CI_COMMIT_SHA:0:8} -v) - export VERSION=$(docker run ${CI_REGISTRY_IMAGE}/signal-server:${CI_COMMIT_SHA:0:8} version)
- docker tag ${CI_REGISTRY_IMAGE}/signal-server:${CI_COMMIT_SHA:0:8} ${CI_REGISTRY_IMAGE}/signal-server:${CI_COMMIT_REF_SLUG} - docker tag ${CI_REGISTRY_IMAGE}/signal-server:${CI_COMMIT_SHA:0:8} ${CI_REGISTRY_IMAGE}/signal-server:${CI_COMMIT_REF_SLUG}
- docker tag ${CI_REGISTRY_IMAGE}/signal-server:${CI_COMMIT_SHA:0:8} ${CI_REGISTRY_IMAGE}/signal-server:${VERSION} - docker tag ${CI_REGISTRY_IMAGE}/signal-server:${CI_COMMIT_SHA:0:8} ${CI_REGISTRY_IMAGE}/signal-server:${VERSION}
- docker push ${CI_REGISTRY_IMAGE}/signal-server:${CI_COMMIT_SHA:0:8} - docker push ${CI_REGISTRY_IMAGE}/signal-server:${CI_COMMIT_SHA:0:8}

4
migrate-and-start-server.sh
View file

@ -1,5 +1,9 @@
#!/bin/bash #!/bin/bash
set -exu set -exu
if [[ "$1" == "version" ]]; then
java -jar /usr/share/TextSecureServer.jar -v
exit
fi
java -jar /usr/share/TextSecureServer.jar abusedb migrate /etc/signal-server.yaml java -jar /usr/share/TextSecureServer.jar abusedb migrate /etc/signal-server.yaml
java -jar /usr/share/TextSecureServer.jar accountdb migrate /etc/signal-server.yaml java -jar /usr/share/TextSecureServer.jar accountdb migrate /etc/signal-server.yaml
java -jar /usr/share/TextSecureServer.jar messagedb migrate /etc/signal-server.yaml java -jar /usr/share/TextSecureServer.jar messagedb migrate /etc/signal-server.yaml