From 10396f3d5a5f56b880f3b09cb77fe1dedbce9694 Mon Sep 17 00:00:00 2001 From: Pahud Hsieh Date: Mon, 27 Sep 2021 13:51:51 +0000 Subject: [PATCH] use container image --- .gitpod.yml | 3 +-- .projenrc.js | 2 +- package.json | 10 +++++----- yarn.lock | 44 +++++++++++++++----------------------------- 4 files changed, 22 insertions(+), 37 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index eb3fc07..bf83ac7 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,7 +1,6 @@ # ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". -image: - file: .gitpod.Dockerfile +image: public.ecr.aws/pahudnet/gitpod-workspace:latest tasks: - command: npx projen upgrade init: yarn gitpod:prebuild diff --git a/.projenrc.js b/.projenrc.js index 1594741..d75c9ec 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -75,7 +75,7 @@ gitpodPrebuild.exec('yarn install'); gitpodPrebuild.exec('npx projen compile'); let gitpod = new Gitpod(project, { - dockerImage: DevEnvironmentDockerImage.fromFile('.gitpod.Dockerfile'), + dockerImage: DevEnvironmentDockerImage.fromImage('public.ecr.aws/pahudnet/gitpod-workspace:latest'), prebuilds: { addCheck: true, addBadge: true, diff --git a/package.json b/package.json index 9df5fd7..3dc86ce 100644 --- a/package.json +++ b/package.json @@ -38,8 +38,8 @@ "@aws-cdk/assert": "^1.101.0", "@types/jest": "^26.0.24", "@types/node": "^14.17.0", - "@typescript-eslint/eslint-plugin": "^4.31.1", - "@typescript-eslint/parser": "^4.31.1", + "@typescript-eslint/eslint-plugin": "^4.31.2", + "@typescript-eslint/parser": "^4.31.2", "eslint": "^7.32.0", "eslint-import-resolver-node": "^0.3.6", "eslint-import-resolver-typescript": "^2.5.0", @@ -52,7 +52,7 @@ "jsii-pacmak": "^1.34.0", "json-schema": "^0.3.0", "npm-check-updates": "^11", - "projen": "^0.28.18", + "projen": "^0.28.31", "standard-version": "^9", "ts-jest": "^26.5.6", "typescript": "^4.4.3" @@ -70,7 +70,7 @@ "@aws-cdk/aws-secretsmanager": "^1.101.0", "@aws-cdk/core": "^1.101.0", "@aws-cdk/custom-resources": "^1.101.0", - "cdk-fargate-run-task": "^0.1.87", + "cdk-fargate-run-task": "^0.1.95", "constructs": "^3.2.27" }, "dependencies": { @@ -86,7 +86,7 @@ "@aws-cdk/aws-secretsmanager": "^1.101.0", "@aws-cdk/core": "^1.101.0", "@aws-cdk/custom-resources": "^1.101.0", - "cdk-fargate-run-task": "^0.1.87" + "cdk-fargate-run-task": "^0.1.95" }, "bundledDependencies": [], "keywords": [ diff --git a/yarn.lock b/yarn.lock index bf05c96..2e0c1f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1536,7 +1536,7 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^4.31.1": +"@typescript-eslint/eslint-plugin@^4.31.2": version "4.31.2" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.2.tgz#9f41efaee32cdab7ace94b15bd19b756dd099b0a" integrity sha512-w63SCQ4bIwWN/+3FxzpnWrDjQRXVEGiTt9tJTRptRXeFvdZc/wLiz3FQUwNQ2CVoRGI6KUWMNUj/pk63noUfcA== @@ -1561,7 +1561,7 @@ eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/parser@^4.31.1": +"@typescript-eslint/parser@^4.31.2": version "4.31.2" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.31.2.tgz#54aa75986e3302d91eff2bbbaa6ecfa8084e9c34" integrity sha512-EcdO0E7M/sv23S/rLvenHkb58l3XhuSZzKf6DBvLgHqOYdL6YFMYVtreGFWirxaU2mS1GYDby3Lyxco7X5+Vjw== @@ -1706,11 +1706,11 @@ ajv@^8.0.1: uri-js "^4.2.2" ansi-align@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb" - integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw== + version "3.0.1" + resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" + integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w== dependencies: - string-width "^3.0.0" + string-width "^4.1.0" ansi-colors@^4.1.1: version "4.1.1" @@ -2177,10 +2177,10 @@ caseless@~0.12.0: resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -cdk-fargate-run-task@^0.1.87: - version "0.1.94" - resolved "https://registry.yarnpkg.com/cdk-fargate-run-task/-/cdk-fargate-run-task-0.1.94.tgz#81fb063e112c8b6843f811b7d79e56cb030fcb19" - integrity sha512-1cQxOppyUb2LyCZmS9DVJ9U33nUSZ+SefOS7jK8CISKErChXZHjR32N3YPsFXt1MKICJPMMS+4gSYMNtad7r9w== +cdk-fargate-run-task@^0.1.95: + version "0.1.95" + resolved "https://registry.yarnpkg.com/cdk-fargate-run-task/-/cdk-fargate-run-task-0.1.95.tgz#8e21d6c69f34e8eb4f6a5015f91a65f325cdf184" + integrity sha512-aLzWG1HdLBJkUqKNBB/TAGaBeBtL307NeJFI8809GEivmBcWqKgZlBVimdyJQcYjAnQaMsZ8heExGMxDVIHcOg== dependencies: "@aws-cdk/aws-ec2" "^1.73.0" "@aws-cdk/aws-ecs" "^1.73.0" @@ -2961,11 +2961,6 @@ emittery@^0.7.1: resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82" integrity sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ== -emoji-regex@^7.0.1: - version "7.0.3" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" - integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== - emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -6258,10 +6253,10 @@ progress@^2.0.0, progress@^2.0.3: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -projen@^0.28.18: - version "0.28.30" - resolved "https://registry.yarnpkg.com/projen/-/projen-0.28.30.tgz#cbe1a2bc0efdb7f6e3ad313b53dde542f57b11a4" - integrity sha512-QvqCeKxf3/dhgAzDllpCD52JzSuskfic6kCfjG9AlXnY7Ae8f3gC7Fy4Ke4lGxzCXrHJQp/2yvQQKhGpKS938A== +projen@^0.28.31: + version "0.28.31" + resolved "https://registry.yarnpkg.com/projen/-/projen-0.28.31.tgz#1bc20ac9d0c769d1a2d1d584c36e4c6ec878a9ce" + integrity sha512-6zWEwI07nvHIxDqFIq3z5r7C5uLH1hJOTDjEDUJtr8fEal1f6dN9f9hHCGdGjUaySWgqa0ssNEGMOED1Evu8eg== dependencies: "@iarna/toml" "^2.2.5" chalk "^4.1.2" @@ -7045,15 +7040,6 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string-width@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" - integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== - dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" - string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" @@ -7117,7 +7103,7 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" -strip-ansi@^5.1.0, strip-ansi@^5.2.0: +strip-ansi@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==