From 888ca8e375d22083a83a69882ee7c2ce41f5f1da Mon Sep 17 00:00:00 2001 From: Lewis Daly Date: Tue, 28 Sep 2021 20:47:58 +0930 Subject: [PATCH] fix: remove devDependencies from docker image (#92) * fix: remove devDependencies from docker image * fix: move devDependencies to dependencies * fix: `SLACK_WEBHOOK_ANNOUNCEMENT_CI_CD` env var --- .circleci/config.yml | 2 +- Dockerfile | 3 +-- package-lock.json | 38 ++++++++------------------------------ package.json | 20 ++++++++++---------- 4 files changed, 20 insertions(+), 43 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1b995a1b..9cabd530 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -390,7 +390,7 @@ jobs: docker push $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:${CIRCLE_TAG} - slack/status: fail_only: true - webhook: "$SLACK_WEBHOOK_ANNOUNCMENT_CI_CD" + webhook: "$SLACK_WEBHOOK_ANNOUNCEMENT_CI_CD" failure_message: 'Publishing docker image failed for: \`"${DOCKER_ORG}/${CIRCLE_PROJECT_REPONAME}:${CIRCLE_TAG}"\`' license-scan: diff --git a/Dockerfile b/Dockerfile index 18328f39..52095f51 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,6 @@ USER as-user COPY --chown=as-user --from=builder /opt/auth-service . # cleanup -# disable prune, breaks tests -# RUN npm prune --production +RUN npm prune --production EXPOSE 4004 CMD ["npm", "run", "start"] diff --git a/package-lock.json b/package-lock.json index ecd4cc66..93d5f478 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2824,8 +2824,7 @@ "@types/boom": { "version": "7.3.0", "resolved": "https://registry.npmjs.org/@types/boom/-/boom-7.3.0.tgz", - "integrity": "sha512-PH7bfkt1nu4pnlxz+Ws+wwJJF1HE12W3ia+Iace2JT7q56DLH3hbyjOJyNHJYRxk3PkKaC36fHfHKyeG1rMgCA==", - "dev": true + "integrity": "sha512-PH7bfkt1nu4pnlxz+Ws+wwJJF1HE12W3ia+Iace2JT7q56DLH3hbyjOJyNHJYRxk3PkKaC36fHfHKyeG1rMgCA==" }, "@types/bytebuffer": { "version": "5.0.42", @@ -2839,8 +2838,7 @@ "@types/catbox": { "version": "10.0.6", "resolved": "https://registry.npmjs.org/@types/catbox/-/catbox-10.0.6.tgz", - "integrity": "sha512-qS0VHlL6eBUUoUeBnI/ASCffoniS62zdV6IUtLSIjGKmRhZNawotaOMsTYivZOTZVktfe9koAJkD9XFac7tEEg==", - "dev": true + "integrity": "sha512-qS0VHlL6eBUUoUeBnI/ASCffoniS62zdV6IUtLSIjGKmRhZNawotaOMsTYivZOTZVktfe9koAJkD9XFac7tEEg==" }, "@types/color-name": { "version": "1.1.1", @@ -2882,7 +2880,6 @@ "version": "18.0.5", "resolved": "https://registry.npmjs.org/@types/hapi/-/hapi-18.0.5.tgz", "integrity": "sha512-OnBslvAL//tsTZemW8wSGrVUj7BgtS16kBicgKCtEpHle9A3pOd7X4ViykKv/X3rh7g636mDzoqQ27+Ols5GQw==", - "dev": true, "requires": { "@types/boom": "*", "@types/catbox": "*", @@ -2897,14 +2894,12 @@ "@types/hapi__catbox": { "version": "10.2.3", "resolved": "https://registry.npmjs.org/@types/hapi__catbox/-/hapi__catbox-10.2.3.tgz", - "integrity": "sha512-gs6MKMKXzWpSqeYsPaDIDAxD8jLNg7aFxgAJE6Jnc+ns072Z9fuh39/NF5gSk1KNoGCLnIpeZ0etT9gY9QDCKg==", - "dev": true + "integrity": "sha512-gs6MKMKXzWpSqeYsPaDIDAxD8jLNg7aFxgAJE6Jnc+ns072Z9fuh39/NF5gSk1KNoGCLnIpeZ0etT9gY9QDCKg==" }, "@types/hapi__hapi": { "version": "20.0.8", "resolved": "https://registry.npmjs.org/@types/hapi__hapi/-/hapi__hapi-20.0.8.tgz", "integrity": "sha512-NNslrYq2XQwm4uOqNcSWKpYtaeMr4DkQdrFzSB7p9rKB9ppJLh3mgP2wak9vBZl7/Cnhhb+JVBcUZCOUcW0JPA==", - "dev": true, "requires": { "@hapi/boom": "^9.0.0", "@hapi/iron": "^6.0.0", @@ -2920,7 +2915,6 @@ "version": "4.1.3", "resolved": "https://registry.npmjs.org/@hapi/podium/-/podium-4.1.3.tgz", "integrity": "sha512-ljsKGQzLkFqnQxE7qeanvgGj4dejnciErYd30dbrYzUOF/FyS/DOF97qcrT3bhoVwCYmxa6PEMhxfCPlnUcD2g==", - "dev": true, "requires": { "@hapi/hoek": "9.x.x", "@hapi/teamwork": "5.x.x", @@ -2933,7 +2927,6 @@ "version": "5.2.2", "resolved": "https://registry.npmjs.org/@types/hapi__inert/-/hapi__inert-5.2.2.tgz", "integrity": "sha512-Vp9HS2wi3Qbm1oUlcTvzA2Zd+f3Dwg+tgLqWA6KTCgKbQX4LCPKIvVssbaQAVncmcpH0aPrtkAfftJlS/sMsGg==", - "dev": true, "requires": { "@types/hapi__hapi": "*" } @@ -2942,7 +2935,6 @@ "version": "4.1.3", "resolved": "https://registry.npmjs.org/@types/hapi__mimos/-/hapi__mimos-4.1.3.tgz", "integrity": "sha512-vZiKXZ0QqwSh0v1z9/f/VEPvmAHQaAXeVK9kGQIQH+2cqxrb2IL4TSDF0aPhPnNzuCvcUWaeCuGXj8V79v/kEA==", - "dev": true, "requires": { "@types/mime-db": "*" } @@ -2951,7 +2943,6 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/@types/hapi__shot/-/hapi__shot-4.1.1.tgz", "integrity": "sha512-44Jj7jJAFgNVgfdbyVtBUbEIbYqWRKAbLR4kiQxBbVEdf8ZKfa5Hg1qg4QdzXBgjw0mopewU4wx1/eWRTVelNQ==", - "dev": true, "requires": { "@types/node": "*" } @@ -2960,7 +2951,6 @@ "version": "5.5.2", "resolved": "https://registry.npmjs.org/@types/hapi__vision/-/hapi__vision-5.5.2.tgz", "integrity": "sha512-XGpvn+lfvk9ervfe9VlDL47jk3KF60I5VjoazxLQBklZ7t2MoGhLFo+SI9T89Abwnw3OYjumrOM/DqEWazsr1w==", - "dev": true, "requires": { "@types/hapi__hapi": "*", "handlebars": "^4.1" @@ -2970,7 +2960,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/@types/iron/-/iron-5.0.1.tgz", "integrity": "sha512-Ng5BkVGPt7Tw9k1OJ6qYwuD9+dmnWgActmsnnrdvs4075N8V2go1f6Pz8omG3q5rbHjXN6yzzZDYo3JOgAE/Ug==", - "dev": true, "requires": { "@types/node": "*" } @@ -3023,14 +3012,12 @@ "@types/mime-db": { "version": "1.43.0", "resolved": "https://registry.npmjs.org/@types/mime-db/-/mime-db-1.43.0.tgz", - "integrity": "sha512-nCqnKWfvDzTVRh8NS9Zn+rnZYs5+iw5hx3G0nFgKM/R2mJQwPChin4DQ4zXlXnxTtc/3Ys5FnWweKW6NW+d2aw==", - "dev": true + "integrity": "sha512-nCqnKWfvDzTVRh8NS9Zn+rnZYs5+iw5hx3G0nFgKM/R2mJQwPChin4DQ4zXlXnxTtc/3Ys5FnWweKW6NW+d2aw==" }, "@types/mimos": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/@types/mimos/-/mimos-3.0.2.tgz", "integrity": "sha512-UG3sdP/9HOk0oA1l8VylaZ0fjy6O/QGEeivOK9JhMjgJkcBJRdfsI6FtXFtg6UH17txmxuDOiIsTlrpBkayK0A==", - "dev": true, "requires": { "@types/mime-db": "*" } @@ -3065,8 +3052,7 @@ "@types/podium": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@types/podium/-/podium-1.0.0.tgz", - "integrity": "sha1-v6ohUb4rHWEJzGn3+qnawsujuyA=", - "dev": true + "integrity": "sha1-v6ohUb4rHWEJzGn3+qnawsujuyA=" }, "@types/prettier": { "version": "2.3.2", @@ -3082,8 +3068,7 @@ "@types/rc": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@types/rc/-/rc-1.1.0.tgz", - "integrity": "sha512-qw1q31xPnaeExbOA1daA3nfeKW2uZQN4Xg8QqZDM3vsXPHK/lyDpjWXJQIcrByRDcBzZJ3ccchSMMTDtCWgFpA==", - "dev": true + "integrity": "sha512-qw1q31xPnaeExbOA1daA3nfeKW2uZQN4Xg8QqZDM3vsXPHK/lyDpjWXJQIcrByRDcBzZJ3ccchSMMTDtCWgFpA==" }, "@types/redis": { "version": "2.8.31", @@ -3097,7 +3082,6 @@ "version": "0.17.0", "resolved": "https://registry.npmjs.org/@types/redis-mock/-/redis-mock-0.17.0.tgz", "integrity": "sha512-UDKHu9otOSE1fPjgn0H7UoggqVyuRYfo3WJpdXdVmzgGmr1XIM/dTk/gRYf/bLjIK5mxpV8inA5uNBS2sVOilA==", - "dev": true, "requires": { "@types/redis": "*" } @@ -3106,7 +3090,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/@types/shot/-/shot-4.0.0.tgz", "integrity": "sha512-Xv+n8yfccuicMlwBY58K5PVVNtXRm7uDzcwwmCarBxMP+XxGfnh1BI06YiVAsPbTAzcnYsrzpoS5QHeyV7LS8A==", - "dev": true, "requires": { "@types/node": "*" } @@ -3985,7 +3968,6 @@ "version": "0.21.1", "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", - "dev": true, "requires": { "follow-redirects": "^1.10.0" } @@ -7884,8 +7866,7 @@ "follow-redirects": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz", - "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==", - "dev": true + "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==" }, "for-in": { "version": "1.0.2", @@ -20113,7 +20094,6 @@ "version": "3.10.1", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz", "integrity": "sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==", - "dev": true, "requires": { "json5": "^2.2.0", "minimist": "^1.2.0", @@ -20124,7 +20104,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, "requires": { "minimist": "^1.2.5" } @@ -20221,8 +20200,7 @@ "typescript": { "version": "4.3.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", - "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", - "dev": true + "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==" }, "uc.micro": { "version": "1.0.6", diff --git a/package.json b/package.json index 49ac5db9..5a4a466e 100644 --- a/package.json +++ b/package.json @@ -75,16 +75,9 @@ "@commitlint/cli": "^12.1.4", "@commitlint/config-conventional": "^12.1.4", "@redocly/openapi-cli": "^1.0.0-beta.53", - "@types/hapi": "^18.0.5", - "@types/hapi__hapi": "^20.0.8", - "@types/hapi__inert": "^5.2.2", - "@types/hapi__vision": "^5.5.2", - "@types/rc": "^1.1.0", - "@types/redis-mock": "^0.17.0", "@typescript-eslint/eslint-plugin": "^4.28.2", "@typescript-eslint/parser": "^4.28.2", "add": "^2.0.6", - "axios": "^0.21.1", "eslint": "7.30.0", "eslint-config-prettier": "8.3.0", "eslint-config-standard": "16.0.3", @@ -110,11 +103,10 @@ "sqlite3": "^5.0.2", "standard-version": "^9.3.0", "swagger-cli": "^4.0.4", - "ts-jest": "^27.0.5", - "tsconfig-paths": "^3.10.1", - "typescript": "4.3.5" + "ts-jest": "^27.0.5" }, "dependencies": { + "axios": "^0.21.1", "@hapi/boom": "^9.1.3", "@hapi/good": "^9.0.1", "@hapi/hapi": "^20.1.5", @@ -136,6 +128,12 @@ "@types/promise-timeout": "^1.3.0", "@types/redis": "^2.8.28", "@types/uuid": "^8.3.1", + "@types/hapi": "^18.0.5", + "@types/hapi__hapi": "^20.0.8", + "@types/hapi__inert": "^5.2.2", + "@types/hapi__vision": "^5.5.2", + "@types/rc": "^1.1.0", + "@types/redis-mock": "^0.17.0", "ajv": "8.6.0", "ajv-keywords": "5.0.0", "atob": "^2.1.2", @@ -164,6 +162,8 @@ "redis": "^3.1.2", "string-to-arraybuffer": "^1.0.2", "ts-node": "^10.0.0", + "tsconfig-paths": "^3.10.1", + "typescript": "4.3.5", "uuid": "^8.3.2" }, "peerDependencies": {