diff --git a/Dockerfile b/Dockerfile index 7b33fa4..94e4064 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,19 @@ FROM node:18-alpine -RUN mkdir -p /usr/src/app && \ - chown -R node:node /usr/src/app - -USER node +RUN mkdir -p /usr/src/app WORKDIR /usr/src/app -COPY --chown=node:node package.json /usr/src/app -COPY --chown=node:node package-lock.json /usr/src/app -COPY . /usr/src/app +COPY package.json /usr/src/app +COPY package-lock.json /usr/src/app + +# Change ownership of files before running npm install +RUN chown -R node:node /usr/src/app + +USER node RUN npm install +COPY . /usr/src/app + CMD ["node", "src/index.js"] diff --git a/build/Jenkinsfile b/build/Jenkinsfile index 23022cf..0150d60 100644 --- a/build/Jenkinsfile +++ b/build/Jenkinsfile @@ -47,7 +47,10 @@ node('docker') { usernamePassword(credentialsId: params.CREDENTIALS_ID, usernameVariable: 'REGISTRY_USERNAME', passwordVariable: 'REGISTRY_PASSWORD') ]) { env.REGISTRY = params.REGISTRY - sh 'pushd pushgateway-pruner && ./build/build-release.sh ' + params.RELEASE_TAG + ' ' + params.IMAGE_NAME + ' && popd' + sh """ + cd pushgateway-pruner + ./build/build-release.sh ${params.RELEASE_TAG} ${params.IMAGE_NAME} + """ } } } diff --git a/package-lock.json b/package-lock.json old mode 100644 new mode 100755 index 828914f..0bf3f4f --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pushgateway-pruner", - "version": "0.1.2", + "version": "0.2.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pushgateway-pruner", - "version": "0.1.2", + "version": "0.2.1", "license": "Apache-2.0", "dependencies": { "axios": "1.7.7", diff --git a/package.json b/package.json old mode 100644 new mode 100755 index 52834ad..0be14f6 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pushgateway-pruner", - "version": "0.1.2", + "version": "0.2.1", "description": "Daemon which regularly queries a Prometheus Pushgateway and prunes groupings which have not been pushed for a certain amount of time.", "main": "index.js", "repository": {