From fa4b026b32395ba182184fbe85d5af7950488390 Mon Sep 17 00:00:00 2001 From: Amninder Kaur Date: Fri, 12 Jan 2024 13:08:17 +1100 Subject: [PATCH] chore: better approach --- bin/ghcr-publish.sh | 6 +++--- lock-manager/Dockerfile | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/ghcr-publish.sh b/bin/ghcr-publish.sh index 198a0cc..f1d6704 100644 --- a/bin/ghcr-publish.sh +++ b/bin/ghcr-publish.sh @@ -3,11 +3,11 @@ set -e package_name=$1 version=$2 - -docker_file=$package_name/Dockerfile +echo $(pwd) +cd $package_name tag_with_version=pit-$package_name:$version tag_ref=ghcr.io/kindredgroup/pit-toolkit/$tag_with_version echo $tag_ref -docker build -f $docker_file . --tag $tag_ref +docker build . --tag $tag_ref #for ghcr.io access token mentioned in the github secrets and accessed in actions docker push $tag_ref diff --git a/lock-manager/Dockerfile b/lock-manager/Dockerfile index 24c8654..2051441 100644 --- a/lock-manager/Dockerfile +++ b/lock-manager/Dockerfile @@ -4,10 +4,10 @@ FROM node:18.18.2-alpine3.18 AS baseimage FROM baseimage AS BUILD WORKDIR /opt/build -COPY ${pwd}/lock-manager/package.json ${pwd}/lock-manager/package-lock.json ${pwd}/lock-manager/tsconfig.json ./ +COPY package.json package-lock.json tsconfig.json ./ RUN npm ci -COPY ${pwd}/lock-manager/src/ ./src +COPY src/ ./src RUN npm run build @@ -16,10 +16,10 @@ FROM baseimage AS RUN WORKDIR /opt/build -COPY ${pwd}/lock-manager/package.json ${pwd}/lock-manager/package-lock.json ./ +COPY package.json package-lock.json ./ COPY --from=BUILD /opt/build/node_modules/ ./node_modules COPY --from=BUILD /opt/build/dist/ ./dist -COPY ${pwd}/lock-manager/migrations/ ./migrations +COPY migrations/ ./migrations CMD ["npm", "run", "migrate_and_start"]