From 59c07e8a43f490965a76380a237acae98798141a Mon Sep 17 00:00:00 2001 From: slynn1324 Date: Mon, 4 Oct 2021 16:16:56 -0500 Subject: [PATCH] updated build scripts --- .dockerignore | 4 ++-- Dockerfile | 2 +- docker-build.sh | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.dockerignore b/.dockerignore index 42d3d25..dfdb116 100644 --- a/.dockerignore +++ b/.dockerignore @@ -4,8 +4,8 @@ #only include these files !main.js !server -!static +!client !templates !package.json !package-lock.json -!LICENSE \ No newline at end of file +!LICENSE diff --git a/Dockerfile b/Dockerfile index 7844b6a..59200ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,4 +16,4 @@ RUN apk add build-base python3 && npm install --verbose && apk del build-base py RUN mkdir /data && npm install -ENTRYPOINT ["sh", "-c" , "node server.js -i /data/images -d /data/tinypin.db"] +ENTRYPOINT ["sh", "-c" , "node main.js -i /data/images -d /data/tinypin.db"] diff --git a/docker-build.sh b/docker-build.sh index abc846f..e710d3e 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -1,7 +1,9 @@ #!/bin/sh +VERSION=$(git rev-parse --verify --short HEAD) + docker build \ -t slynn1324/tinypin \ - --build-arg VERSION=$(git rev-parse --verify --short HEAD) \ + --build-arg VERSION=$VERSION \ .