unify build context of local build / test and docker hub build

Author: angelo-v

Makefile

@@ -8,7 +8,7 @@ lint: ## run hadolint against the Dockerfile
 	docker run --rm -i hadolint/hadolint < src/Dockerfile
 
 build: ## build the docker image
-	docker build --file ./src/Dockerfile --tag aveltens/solid-server .
+	cd src && docker build --tag aveltens/solid-server .
 
 inspect: build ## run a shell in the docker image
 	docker run --rm -it --entrypoint sh aveltens/solid-server

src/Dockerfile

@@ -11,9 +11,9 @@ ENV PROCESS_USER=node
 ENV TEMPORARY_CERT_NAME=solid-temporary
 
 WORKDIR ${SOLID_HOME}
-COPY ./src/entrypoint.sh ./entrypoint.sh
-COPY ./src/checks.sh ./checks.sh
-COPY ./src/create-temporary-cert.sh ./create-temporary-cert.sh
+COPY ./entrypoint.sh ./entrypoint.sh
+COPY ./checks.sh ./checks.sh
+COPY ./create-temporary-cert.sh ./create-temporary-cert.sh
 RUN chown --recursive ${PROCESS_USER}:${PROCESS_USER} ${SOLID_HOME}
 
 USER ${PROCESS_USER}

src/hooks/build

@@ -1,3 +1,5 @@
 #!/bin/bash
 
-docker build --build-arg SOLID_SERVER_VERSION=${SOURCE_BRANCH} -f Dockerfile -t $IMAGE_NAME .
+echo building version ${SOURCE_BRANCH} with image name $IMAGE_NAME .
+
+docker build --build-arg SOLID_SERVER_VERSION=${SOURCE_BRANCH} --file Dockerfile -t $IMAGE_NAME .

test/conftest.py

@@ -7,5 +7,5 @@ def client():
 
 @pytest.fixture(scope="session")
 def image(client):
-     img, _ = client.images.build(path='./', dockerfile='src/Dockerfile')
+     img, _ = client.images.build(path='./src', dockerfile='Dockerfile')
      return img