Merge branch 'master' into djdefi-postgres-latest

Author: djdefi

.travis.yml

@@ -12,7 +12,7 @@ before_install:
     - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
     - chmod +x docker-compose
     - sudo mv docker-compose /usr/local/bin
-    - docker pull appropriate/curl:latest
+    - docker pull curlimages/curl:latest
 
 script:
     - bats test/test.full.bats

Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:1.17.5-alpine
+FROM nginx:1.17.8-alpine
 
 EXPOSE 8000
 CMD ["/sbin/entrypoint.sh"]

Makefile

@@ -2,7 +2,7 @@ SILENT :
 .PHONY : test
 
 update-dependencies:
-	docker pull appropriate/curl:latest
+	docker pull curlimages/curl:latest
 	docker pull postgres:9.5
 
 test:
@@ -15,4 +15,4 @@ compose-up:
 	docker-compose up
 
 build:
-	docker build -t cachet/docker	.
+	docker build -t cachet/docker .

test/test_helpers.bash

@@ -31,7 +31,7 @@ function curl_container {
 	local -r container=$1
 	local -r path=$2
 	shift 2
-	docker run --rm --net=docker_default --label bats-type="curl" appropriate/curl --silent \
+	docker run --rm --net=docker_default --label bats-type="curl" curlimages/curl --silent \
 		--connect-timeout 5 \
 		--max-time 20 \
 		--retry 4 --retry-delay 5 \