Skip to content

Commit fbce436

Browse files
committed
Fix release
1 parent 3cffcb9 commit fbce436

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

.travis.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ case "$1" in
3939
;;
4040

4141
deploy)
42-
if [[ "$TEST_MODE" = "local" ]]; then
43-
make deploy
44-
fi
42+
make deploy
4543
;;
4644

4745
install)

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ deploy:
4343
on: # yamllint disable rule:truthy
4444
repo: ascoderu/opwen-cloudserver
4545
tags: true
46+
condition: $TEST_MODE = local
4647

4748
- provider: pages
4849
skip-cleanup: true
@@ -51,3 +52,4 @@ deploy:
5152
on: # yamllint disable rule:truthy
5253
repo: ascoderu/opwen-cloudserver
5354
tags: true
55+
condition: $TEST_MODE = local

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ services:
6262
- webapp
6363

6464
statuspage:
65+
image: ${DOCKER_REPO}/opwenstatuspage:${BUILD_TAG}
6566
build:
6667
context: .
6768
dockerfile: docker/statuspage/Dockerfile

makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,9 @@ release-docker:
129129
) done
130130

131131
release-gh-pages:
132-
docker cp "$(shell docker-compose images statuspage | grep statuspage | cut -f1 -d' '):/app/opwen-statuspage" ./build
132+
docker container create --name statuspage "$(DOCKER_USERNAME)/opwenstatuspage:$(DOCKER_TAG)" && \
133+
docker cp "statuspage:/app/opwen-statuspage" ./build && \
134+
docker container rm statuspage
133135

134136
release: release-docker release-gh-pages
135137

0 commit comments

Comments
 (0)