Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit d5dee4f

Browse filesBrowse files
committed
Update tests for docker hub
1 parent c5f1f92 commit d5dee4f
Copy full SHA for d5dee4f

File tree

Expand file treeCollapse file tree

2 files changed

+6
-4
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+6
-4
lines changed

‎Makefile

Copy file name to clipboardExpand all lines: Makefile
+2-3Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ e2e:
3434
@BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker-compose -f docker-compose.test.yml up -d
3535
@echo "Wait 30 seconds to spinn up everything"
3636
@sleep 30
37-
@docker run --network container:$$(docker-compose -f docker-compose.test.yml ps -q bookstack) \
38-
appropriate/curl --retry 15 --retry-delay 5 --retry-connrefused http://localhost/login
39-
@docker-compose down -v
37+
@BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker-compose -f docker-compose.test.yml run --rm sut
38+
@BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker-compose -f docker-compose.test.yml down -v
4039

‎docker-compose.test.yml

Copy file name to clipboardExpand all lines: docker-compose.test.yml
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
version: '2'
1+
version: '2.4'
22
services:
3+
sut:
4+
image: appropriate/curl
5+
command: ["--retry", "15","--retry-delay","5","--retry-connrefused","http://bookstack/login"]
36
mysql:
47
image: mysql:5.7.21
58
environment:

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.