From c27e4b9d5baeb8048de3d91f362a842f0e5a33a7 Mon Sep 17 00:00:00 2001 From: Kasper Juul Hermansen Date: Fri, 28 Oct 2022 09:02:31 +0000 Subject: [PATCH 1/5] Update all dependencies --- package.json | 14 +++++------ templates/build_release.Dockerfile | 6 ++--- yarn.lock | 38 +++++++++++++++--------------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index 0801489..88a822f 100644 --- a/package.json +++ b/package.json @@ -11,12 +11,12 @@ "react-dom": "18.1.0" }, "devDependencies": { - "@types/node": "17.0.35", - "@types/react": "18.0.9", - "@types/react-dom": "18.0.5", - "autoprefixer": "^10.4.7", - "postcss": "^8.4.14", - "tailwindcss": "^3.1.2", - "typescript": "4.7.2" + "@types/node": "18.11.7", + "@types/react": "18.0.24", + "@types/react-dom": "18.0.8", + "autoprefixer": "10.4.8", + "postcss": "8.4.16", + "tailwindcss": "3.1.8", + "typescript": "4.8.4" } } diff --git a/templates/build_release.Dockerfile b/templates/build_release.Dockerfile index e0c11a7..0c62df3 100644 --- a/templates/build_release.Dockerfile +++ b/templates/build_release.Dockerfile @@ -1,5 +1,5 @@ # Install dependencies only when needed -FROM node:16-alpine AS deps +FROM node:19-alpine AS deps # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed. RUN apk add --no-cache libc6-compat RUN yarn global add pnpm @@ -11,7 +11,7 @@ RUN pnpm i # Rebuild the source code only when needed -FROM node:16-alpine AS builder +FROM node:19-alpine AS builder WORKDIR /app COPY --from=deps /app/node_modules ./node_modules COPY . . @@ -27,7 +27,7 @@ RUN yarn build # RUN npm run build # Production image, copy all the files and run next -FROM node:16-alpine AS runner +FROM node:19-alpine AS runner WORKDIR /app ENV NODE_ENV production diff --git a/yarn.lock b/yarn.lock index 276a0b3..79b99b5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -100,20 +100,20 @@ dependencies: tslib "^2.4.0" -"@types/node@17.0.35": - version "17.0.35" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.35.tgz#635b7586086d51fb40de0a2ec9d1014a5283ba4a" - integrity sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg== +"@types/node@18.11.7": + version "18.11.7" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.7.tgz#8ccef136f240770c1379d50100796a6952f01f94" + integrity sha512-LhFTglglr63mNXUSRYD8A+ZAIu5sFqNJ4Y2fPuY7UlrySJH87rRRlhtVmMHplmfk5WkoJGmDjE9oiTfyX94CpQ== "@types/prop-types@*": version "15.7.5" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== -"@types/react-dom@18.0.5": - version "18.0.5" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.5.tgz#330b2d472c22f796e5531446939eacef8378444a" - integrity sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA== +"@types/react-dom@18.0.8": + version "18.0.8" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.8.tgz#d2606d855186cd42cc1b11e63a71c39525441685" + integrity sha512-C3GYO0HLaOkk9dDAz3Dl4sbe4AKUGTCfFIZsz3n/82dPNN8Du533HzKatDxeUYWu24wJgMP1xICqkWk1YOLOIw== dependencies: "@types/react" "*" @@ -126,10 +126,10 @@ "@types/scheduler" "*" csstype "^3.0.2" -"@types/react@18.0.9": - version "18.0.9" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.9.tgz#d6712a38bd6cd83469603e7359511126f122e878" - integrity sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw== +"@types/react@18.0.24": + version "18.0.24" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.24.tgz#2f79ed5b27f08d05107aab45c17919754cc44c20" + integrity sha512-wRJWT6ouziGUy+9uX0aW4YOJxAY0bG6/AOk5AW5QSvZqI7dk6VBIbXvcVgIw/W5Jrl24f77df98GEKTJGOLx7Q== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -172,7 +172,7 @@ arg@^5.0.2: resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c" integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg== -autoprefixer@^10.4.7: +autoprefixer@10.4.8: version "10.4.8" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.8.tgz#92c7a0199e1cfb2ad5d9427bd585a3d75895b9e5" integrity sha512-75Jr6Q/XpTqEf6D2ltS5uMewJIx5irCU1oBYJrWjFenq/m12WRRrz6g15L1EIoYvPLXTbEry7rDOwrcYNj77xw== @@ -531,7 +531,7 @@ postcss@8.4.14: picocolors "^1.0.0" source-map-js "^1.0.2" -postcss@^8.4.14: +postcss@8.4.16, postcss@^8.4.14: version "8.4.16" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c" integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ== @@ -622,7 +622,7 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== -tailwindcss@^3.1.2: +tailwindcss@3.1.8: version "3.1.8" resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.1.8.tgz#4f8520550d67a835d32f2f4021580f9fddb7b741" integrity sha512-YSneUCZSFDYMwk+TGq8qYFdCA3yfBRdBlS7txSq0LUmzyeqRe3a8fBQzbz9M3WS/iFT4BNf/nmw9mEzrnSaC0g== @@ -662,10 +662,10 @@ tslib@^2.4.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== -typescript@4.7.2: - version "4.7.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.2.tgz#1f9aa2ceb9af87cca227813b4310fff0b51593c4" - integrity sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A== +typescript@4.8.4: + version "4.8.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6" + integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ== update-browserslist-db@^1.0.5: version "1.0.5" -- 2.45.2 From 0c2055b2afb50c67e3c6084cb341afcc30408d73 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Fri, 28 Oct 2022 22:40:54 +0200 Subject: [PATCH 2/5] with limiter --- .drone.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9cc51b4..0b52321 100644 --- a/.drone.yml +++ b/.drone.yml @@ -42,6 +42,12 @@ steps: from_secret: gitea_id_ed25519 depends_on: - "load_secret" + when: + event: + include: + - push + - tag + - promote - name: push_tags image: kasperhermansen/drone-semantic-release:latest @@ -74,16 +80,14 @@ steps: status: [failure, success] services: -- name: docker - image: docker:dind - privileged: true - volumes: - - name: dockersock - path: /var/run + - name: docker + image: docker:dind + privileged: true + volumes: + - name: dockersock + path: /var/run volumes: - name: ssh temp: {} - name: dockersock temp: {} - - -- 2.45.2 From 0e3a5dbaf9e13f77c1765576a9a39a48a3818065 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Fri, 28 Oct 2022 22:41:09 +0200 Subject: [PATCH 3/5] without success --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 0b52321..2d9db29 100644 --- a/.drone.yml +++ b/.drone.yml @@ -77,7 +77,7 @@ steps: - build - push_tags when: - status: [failure, success] + status: [failure] services: - name: docker -- 2.45.2 From ed91cdea5dcec649c0982c76ccdc06279e4a8cf6 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Fri, 28 Oct 2022 22:43:36 +0200 Subject: [PATCH 4/5] with rebase --- scripts/deploy_release.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/deploy_release.sh b/scripts/deploy_release.sh index 250eac4..d55cd74 100755 --- a/scripts/deploy_release.sh +++ b/scripts/deploy_release.sh @@ -7,4 +7,6 @@ deploymentrepo="$TMP/deployments" cd $deploymentrepo +git pull --rebase + git add . && git commit -m "Added release $SERVICE: ${COMMIT_SHA:0:10}" && git pull && git push -- 2.45.2 From 474718a795ff2f52c893fcf624a41bf689eacb46 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Fri, 28 Oct 2022 22:45:43 +0200 Subject: [PATCH 5/5] trying again --- scripts/deploy_release.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/deploy_release.sh b/scripts/deploy_release.sh index d55cd74..c1fb07e 100755 --- a/scripts/deploy_release.sh +++ b/scripts/deploy_release.sh @@ -7,6 +7,7 @@ deploymentrepo="$TMP/deployments" cd $deploymentrepo -git pull --rebase - -git add . && git commit -m "Added release $SERVICE: ${COMMIT_SHA:0:10}" && git pull && git push +git add . \ + && git commit -m "Added release $SERVICE: ${COMMIT_SHA:0:10}" \ + && git pull --rebase \ + && git push -- 2.45.2