Merge pull request #5 from ps-dev/pdp-889

fix(pdp-889): fix dockerfile
pluralsight · Oct 11, 2023 · ff1cf56 · ff1cf56
2 parents de07e5c + 75c7a95
commit ff1cf56
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Dockerfile.new b/Dockerfile.new
@@ -10,6 +10,6 @@ RUN mkdir -p /etc/hydra && mkdir -p /var/log/hydra && mkdir /ps-publish
 
 EXPOSE 8088
 
-COPY ps-publish/hydra-ingest* /ps-publish
+COPY ps-publish/ /ps-publish
 
 ENTRYPOINT ["/ps-publish/bin/hydra-ingest"]
diff --git a/Makefile b/Makefile
@@ -8,10 +8,14 @@ ENV_FILE = .env
 
 # Target to build the Docker image
 build:
-	mkdir ps-publish
 	sbt clean compile
 	sbt universal:packageBin
+	ls -a
 	unzip ingest/target/universal/*.zip -d ps-publish
+	ls -a
+	mv ps-publish/hydra-ingest*/* ps-publish
+	rm -rf ps-publish/hydra-ingest*
+	cd ps-publish/bin
 	docker build -t $(DOCKER_IMAGE_NAME) -f $(DOCKERFILE) .
 
 # Target to run the Docker container