Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert: "chore(ci): revert: Use DOCKER_REGISTRY, and compat" (#17057)" #17070

Merged
merged 2 commits into from
Nov 28, 2024

Conversation

AndesKrrrrrrrrrrr
Copy link
Member

@AndesKrrrrrrrrrrr AndesKrrrrrrrrrrr commented Nov 28, 2024

This reverts commit efa9f05.

See #17057

Summary by CodeRabbit

  • Chores
    • Updated Dockerfile to enhance clarity and maintainability by standardizing registry variable usage.
    • Improved organization of build stages for better handling of Docker image registries.

Copy link
Contributor

coderabbitai bot commented Nov 28, 2024

Walkthrough

The changes in this pull request focus on updating the scripts/ci/Dockerfile to enhance the handling of Docker image registries. The DOCKER_IMAGE_REGISTRY argument has been replaced with DOCKER_ECR_REGISTRY, which is used to construct a new DOCKER_REGISTRY variable for backward compatibility. The base images across various build stages have been updated to utilize this new variable. The overall structure and logic of the Dockerfile remain unchanged, ensuring consistency in package installation and environment variable definitions.

Changes

File Path Change Summary
scripts/ci/Dockerfile - Updated DOCKER_IMAGE_REGISTRY to DOCKER_ECR_REGISTRY.
- Added DOCKER_IMAGE_REGISTRY and DOCKER_REGISTRY arguments.
- Updated base images in multiple stages to use DOCKER_REGISTRY instead of DOCKER_IMAGE_REGISTRY.

Possibly related PRs

Suggested labels

automerge, high priority

Suggested reviewers

  • busla

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@AndesKrrrrrrrrrrr AndesKrrrrrrrrrrr added deploy-feature Deploys features to dev test everything 💀 test & build everything 💀 labels Nov 28, 2024
@AndesKrrrrrrrrrrr AndesKrrrrrrrrrrr marked this pull request as ready for review November 28, 2024 13:00
@AndesKrrrrrrrrrrr AndesKrrrrrrrrrrr requested a review from a team as a code owner November 28, 2024 13:00
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (1)
scripts/ci/Dockerfile (1)

9-9: Consider build cache implications

The changes to base image references could invalidate existing build caches in CI/CD pipelines. Ensure that:

  1. The new registry paths are accessible in all build environments
  2. Build caches are properly warmed up to maintain build performance
  3. Image pull permissions are correctly configured for the new registry

Consider implementing a registry fallback mechanism in case the primary registry is unavailable:

-FROM ${DOCKER_REGISTRY}/library/node:${NODE_IMAGE_TAG} AS deps
+FROM ${DOCKER_REGISTRY}/library/node:${NODE_IMAGE_TAG} AS deps || FROM node:${NODE_IMAGE_TAG} AS deps

Also applies to: 43-43, 91-91

📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 6a313ad and 72fd33a.

📒 Files selected for processing (1)
  • scripts/ci/Dockerfile (3 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
scripts/ci/Dockerfile (1)

Pattern scripts/**/*: "Confirm that the code adheres to the following:

  • Script efficiency, readability, and maintainability.
  • Usage of environmental variables and configuration files for flexibility.
  • Integration with NX workspace utilities and commands."
🔇 Additional comments (2)
scripts/ci/Dockerfile (2)

3-6: Verify if this change aligns with revert intention

The current changes introduce a new registry handling approach that might not align with the PR's revert intention. The string manipulation in ${DOCKER_ECR_REGISTRY%/docker} could be fragile if the registry path structure changes.


Line range hint 1-180: Verify complete revert implementation

This implementation appears to introduce new complexity rather than simply reverting the changes from PR #17057. A clean revert should restore the exact previous state.

Copy link
Member

@brynjarorng brynjarorng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@AndesKrrrrrrrrrrr AndesKrrrrrrrrrrr added the automerge Merge this PR as soon as all checks pass label Nov 28, 2024
Copy link

codecov bot commented Nov 28, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 35.69%. Comparing base (67c6a26) to head (724aae9).
Report is 1 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main   #17070      +/-   ##
==========================================
- Coverage   35.69%   35.69%   -0.01%     
==========================================
  Files        6938     6938              
  Lines      147105   147105              
  Branches    41822    41822              
==========================================
- Hits        52516    52515       -1     
- Misses      94589    94590       +1     
Flag Coverage Δ
air-discount-scheme-backend 47.89% <ø> (ø)
air-discount-scheme-web 0.00% <ø> (ø)
api 3.34% <ø> (ø)
api-catalogue-services 77.85% <ø> (ø)
api-domains-air-discount-scheme 37.12% <ø> (ø)
api-domains-assets 26.71% <ø> (ø)
api-domains-auth-admin 48.49% <ø> (ø)
api-domains-communications 39.58% <ø> (ø)
api-domains-criminal-record 47.60% <ø> (ø)
api-domains-driving-license 44.52% <ø> (ø)
api-domains-education 30.61% <ø> (ø)
api-domains-health-insurance 34.48% <ø> (ø)
api-domains-mortgage-certificate 34.77% <ø> (ø)
api-domains-payment-schedule 41.34% <ø> (ø)
application-api-files 62.14% <ø> (ø)
application-core 70.91% <ø> (+0.31%) ⬆️
application-system-api 38.73% <ø> (-0.02%) ⬇️
application-template-api-modules 27.77% <ø> (-0.01%) ⬇️
application-templates-accident-notification 28.97% <ø> (ø)
application-templates-car-recycling 3.12% <ø> (ø)
application-templates-criminal-record 25.86% <ø> (ø)
application-templates-driving-license 18.18% <ø> (ø)
application-templates-estate 13.75% <ø> (ø)
application-templates-example-payment 24.80% <ø> (ø)
application-templates-financial-aid 15.80% <ø> (ø)
application-templates-general-petition 23.09% <ø> (ø)
application-templates-inheritance-report 6.58% <ø> (ø)
application-templates-marriage-conditions 15.12% <ø> (ø)
application-templates-mortgage-certificate 43.27% <ø> (ø)
application-templates-parental-leave 29.93% <ø> (ø)
application-types 6.51% <ø> (ø)
application-ui-components 1.27% <ø> (ø)
application-ui-shell 21.44% <ø> (ø)
auth-admin-web 2.43% <ø> (ø)
auth-nest-tools 31.10% <ø> (ø)
auth-react 24.40% <ø> (ø)
auth-shared 75.00% <ø> (ø)
clients-charge-fjs-v2 24.11% <ø> (ø)
clients-driving-license 40.32% <ø> (ø)
clients-driving-license-book 43.53% <ø> (ø)
clients-financial-statements-inao 49.10% <ø> (ø)
clients-license-client 1.26% <ø> (ø)
clients-middlewares 73.33% <ø> (ø)
clients-regulations 42.40% <ø> (ø)
clients-rsk-company-registry 29.76% <ø> (ø)
clients-rsk-personal-tax-return 38.00% <ø> (ø)
clients-smartsolutions 12.77% <ø> (ø)
clients-syslumenn 49.25% <ø> (ø)
clients-zendesk 50.73% <ø> (ø)
cms 0.40% <ø> (ø)
cms-translations 38.91% <ø> (ø)
content-search-index-manager 95.65% <ø> (ø)
content-search-toolkit 8.14% <ø> (ø)
contentful-apps 4.74% <ø> (ø)
dokobit-signing 62.85% <ø> (ø)
email-service 60.65% <ø> (ø)
feature-flags 90.69% <ø> (ø)
file-storage 45.91% <ø> (ø)
financial-aid-backend 51.30% <ø> (ø)
financial-aid-shared 17.81% <ø> (ø)
icelandic-names-registry-backend 54.34% <ø> (ø)
infra-nest-server 48.37% <ø> (ø)
infra-tracing 43.24% <ø> (ø)
island-ui-core 30.94% <ø> (ø)
judicial-system-api 20.36% <ø> (ø)
judicial-system-audit-trail 68.94% <ø> (ø)
judicial-system-backend 55.72% <ø> (ø)
judicial-system-message 67.12% <ø> (ø)
judicial-system-message-handler 48.17% <ø> (ø)
judicial-system-scheduler 71.10% <ø> (ø)
judicial-system-types 42.79% <ø> (ø)
judicial-system-web 28.01% <ø> (ø)
license-api 42.65% <ø> (+0.05%) ⬆️
localization 10.15% <ø> (ø)
logging 48.43% <ø> (ø)
message-queue 68.13% <ø> (ø)
nest-audit 68.20% <ø> (ø)
nest-aws 53.04% <ø> (ø)
nest-config 78.07% <ø> (ø)
nest-core 43.54% <ø> (ø)
nest-feature-flags 51.15% <ø> (ø)
nest-problem 45.82% <ø> (ø)
nest-sequelize 94.44% <ø> (ø)
nest-swagger 51.71% <ø> (ø)
nova-sms 62.18% <ø> (ø)
portals-admin-regulations-admin 1.80% <ø> (ø)
portals-core 18.38% <ø> (ø)
regulations 16.78% <ø> (ø)
residence-history 85.00% <ø> (ø)
services-auth-admin-api 52.56% <ø> (ø)
services-auth-delegation-api 58.47% <ø> (-0.09%) ⬇️
services-auth-ids-api 52.28% <ø> (-0.01%) ⬇️
services-auth-public-api 49.25% <ø> (ø)
services-sessions 65.47% <ø> (-0.05%) ⬇️
services-university-gateway 49.38% <ø> (+0.02%) ⬆️
services-user-notification 46.76% <ø> (ø)
services-user-profile 56.75% <ø> (-0.07%) ⬇️
shared-components 29.13% <ø> (ø)
shared-form-fields 33.88% <ø> (ø)
shared-mocking 60.89% <ø> (ø)
shared-pii 92.85% <ø> (ø)
shared-problem 87.50% <ø> (ø)
shared-utils 27.69% <ø> (ø)
skilavottord-ws 24.14% <ø> (ø)
web 2.45% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

see 2 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 67c6a26...724aae9. Read the comment docs.

@datadog-island-is
Copy link

Datadog Report

All test runs cbe4dd9 🔗

99 Total Test Services: 0 Failed, 91 Passed
🔻 Test Sessions change in coverage: 2 decreased, 2 increased, 196 no change

Test Services
This report shows up to 10 services
Service Name Failed Known Flaky New Flaky Passed Skipped Total Time Code Coverage Change Test Service View
air-discount-scheme-backend 0 0 0 63 0 28.81s N/A Link
air-discount-scheme-web 0 0 0 2 0 7.11s N/A Link
api 0 0 0 4 0 2.39s N/A Link
api-catalogue-services 0 0 0 23 0 9.1s N/A Link
api-domains-air-discount-scheme 0 0 0 6 0 15.87s N/A Link
api-domains-assets 0 0 0 3 0 9.5s N/A Link
api-domains-auth-admin 0 0 0 18 0 10.15s 1 no change Link
api-domains-communications 0 0 0 5 0 30.72s N/A Link
api-domains-criminal-record 0 0 0 5 0 8.29s N/A Link
api-domains-driving-license 0 0 0 23 0 31.52s N/A Link

🔻 Code Coverage Decreases vs Default Branch (2)

  • services-auth-delegation-api - jest 50.38% (-0.04%) - Details
  • services-user-profile - jest 49.05% (-0.02%) - Details

@kodiakhq kodiakhq bot merged commit 9285a00 into main Nov 28, 2024
265 of 274 checks passed
@kodiakhq kodiakhq bot deleted the chore/dockerfile-compat branch November 28, 2024 15:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this PR as soon as all checks pass deploy-feature Deploys features to dev test everything 💀 test & build everything 💀
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants