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

feat!: upgrade bmuschko docker plugin (#93001) #93

Merged
merged 2 commits into from
Feb 7, 2024

Conversation

skiesewetter-intershop
Copy link
Contributor

  • gradle tasks to start a container have been split into the 3 different aspects:
    1. find the container by name
    2. if not existing: create
    3. if not running: start

* gradle tasks to start a container have been split into the 3 different aspects:
  1. *find* the container by name
  2. if not existing: *create*
  3. if not running: *start*
Copy link

github-actions bot commented Feb 6, 2024

Test Results

19 tests   - 4   17 ✅  - 4   1m 51s ⏱️ -7s
 5 suites ±0    2 💤 ±0 
 5 files   ±0    0 ❌ ±0 

Results for commit ae773fd. ± Comparison against base commit f42224d.

This pull request removes 4 tests.
com.intershop.gradle.icm.docker.TaskICMGenSpec ‑ oracle file creation (container + icmas) [gradleVersion: 8.5, #0]
com.intershop.gradle.icm.docker.TaskICMGenSpec ‑ oracle file creation (container) [gradleVersion: 8.5, #0]
com.intershop.gradle.icm.docker.TaskICMGenSpec ‑ oracle file creation (external + icmas) [gradleVersion: 8.5, #0]
com.intershop.gradle.icm.docker.TaskICMGenSpec ‑ oracle file creation (external) [gradleVersion: 8.5, #0]

♻️ This comment has been updated with latest results.

* rolled back unnecessary update of icm-gradle-plugin:6.0.0 to 6.0.1
@@ -210,7 +209,6 @@ imageBuild {
|`webadapter` | `Property<String>` | `docker.intershop.de/intershop/icm-webadapter:latest` | The image contains the web server of the Intershop Commerce Management application with a special Intershop Apache module.
|`webadapteragent` | `Property<String>` | `docker.intershop.de/intershop/icm-webadapteragent:latest` | The web adapter agent image of the Intershop Commerce Management application.
|`mssqldb` | `Property<String>` | `mcr.microsoft.com/mssql/server:2019-latest` | The Microsoft SQL server image. There will be also a build file available.
Copy link
Contributor

Choose a reason for hiding this comment

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

I know you didn't touch this, but the mssql image is incorrect and the solr one should also be solr:latest. But now that I look at it most of the images are actually wrong, since they are now all hosted on dockerhub. So maybe we should fix all of them in a separate PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, maybe we should fix this inside a separate PR.

@skiesewetter-intershop skiesewetter-intershop merged commit 5ff18e6 into master Feb 7, 2024
3 checks passed
@skiesewetter-intershop skiesewetter-intershop deleted the 93001-upgrade-bmuschko-docker-plugin branch February 7, 2024 11:54
regAuthLocator = RegistryAuthLocator(configFile)
project.logger.info("This docker configuration is used: '{}'", configFile.absolutePath)
}
// if (project.findProperty("icm.docker.config") != null) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Please delete this, or if there is a good reason why it must stay commented out, comment that in the code.

task.existingContainer.set(project.provider { findTask.get().foundContainer.orNull })
task.containerName.set(getContainerName())

val os: OperatingSystem = DefaultNativePlatform.getCurrentOperatingSystem()
Copy link
Contributor

Choose a reason for hiding this comment

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

I think it would be better to rely on the system property System.properties['os.name'] for this. Because DefaultNativePlatform is internal, it may break with any minor gradle release.

)
}

/* FIXME SKR project.tasks.register("start${this.getExtensionName()}", StartServerContainer::class.java) { task ->
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is this commented out?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking change enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants