Merge pull request #127 from solidnerd/improve-docker-builds

Add e2e tests back

Author: solidnerd

.circleci/config.yml

@@ -10,16 +10,18 @@ jobs:
           command: |
             find . -type f -name '*.sh' | wc -l
             find . -type f -name '*.sh' | xargs shellcheck -e SC2086 -e SC1090 --external-sources
-  build:
+  e2e:
     docker:
     - image: circleci/golang:1.11.5
     steps:
     - checkout
     - setup_remote_docker:
         docker_layer_caching: true
     - run:
-        name: Create docker image
-        command: make build
+        name: Test Image
+        command: |
+          docker login -u $docker_user -p $docker_password
+          make e2e
 
   build-deploy:
     docker:
@@ -60,11 +62,14 @@ workflows:
             branches: 
               ignore: 
                 - master
-      - build:
+      - build-deploy:
           filters:
             branches: 
               ignore: 
                 - master
+      - e2e:
+          requires:
+            - build-deploy
   deploy:
     jobs:
       - shellcheck

Makefile

@@ -1,7 +1,6 @@
 DOCKER_RELEASE_REG=solidnerd
 DOCKER_IMAGE=bookstack
-
-
+DOCKER_IMAGE_DEV=${DOCKER_IMAGE}-dev
 DOCKER_INTERNAL_TAG := $(shell git rev-parse --short HEAD)
 DOCKER_RELEASE_TAG := $(shell git describe)
 BUILD_DATE := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
@@ -11,20 +10,30 @@ VCS_URL := https://github.com/solidnerd/docker-bookstack
 
 build:
 	docker image build . \
-	-t $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE):$(DOCKER_INTERNAL_TAG) \
+	-t $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG) \
 	--build-arg VCS_REF=$(DOCKER_INTERNAL_TAG) \
 	--build-arg BUILD_DATE=$(BUILD_DATE) \
 	--build-arg VCS_URL=$(VCS_URL) 
 
 push:
-	docker push $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE):$(DOCKER_INTERNAL_TAG)
+	docker push $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG)
 
 pull:
-	docker pull $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE):$(DOCKER_INTERNAL_TAG) 
+	docker pull $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG) 
 
 release:
-	docker tag $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE):$(DOCKER_INTERNAL_TAG) $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE):$(DOCKER_RELEASE_TAG)
-	docker tag $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE):$(DOCKER_INTERNAL_TAG) $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE):latest
+	docker tag $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG) $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE):$(DOCKER_RELEASE_TAG)
+	docker tag $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG) $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE):latest
 
 	docker push $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE):$(DOCKER_RELEASE_TAG)
 	docker push $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE):latest
+
+
+e2e: 
+	@BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker-compose -f docker-compose.test.yml up -d
+	@echo "Wait 30 seconds to spinn up everything"
+	@sleep 30
+	@docker run --network container:$$(docker-compose -f docker-compose.test.yml ps -q bookstack) \
+		appropriate/curl --retry 15 --retry-delay 5 --retry-connrefused http://localhost/login
+	@docker-compose  down -v
+

docker-compose.test.yml

@@ -0,0 +1,32 @@
+version: '2'
+services:
+  mysql:
+    image: mysql:5.7.21
+    environment:
+    - MYSQL_ROOT_PASSWORD=secret
+    - MYSQL_DATABASE=bookstack
+    - MYSQL_USER=bookstack
+    - MYSQL_PASSWORD=secret
+    volumes:
+    - mysql-data:/var/lib/mysql
+
+  bookstack:
+    container_name: bookstack
+    image: ${BOOKSTACK_IMAGE}
+    depends_on:
+    - mysql
+    environment:
+    - DB_HOST=mysql:3306
+    - DB_DATABASE=bookstack
+    - DB_USERNAME=bookstack
+    - DB_PASSWORD=secret
+    volumes:
+    - uploads:/var/www/bookstack/public/uploads
+    - storage-uploads:/var/www/bookstack/public/storage
+    ports:
+    - "8080:80"
+
+volumes:
+ mysql-data:
+ uploads:
+ storage-uploads: