search

oracle / docker-images

Official source of container configurations, images, and examples for Oracle products and projects
https://developer.oracle.com/use-cases/#containers
Universal Permissive License v1.0
6.54k stars 5.42k forks source link

Fix docker version check to remove the OS identifier from the version #2772

Open nasmart opened 7 months ago

nasmart commented 7 months ago

When running OracleDatabase/SingleInstance/dockerfiles/buildContainerImage.sh I noted the following error:

Checking Docker version.
./buildContainerImage.sh: line 97: [: 190311-ol: integer expression expected
Dockerfile

On investigation I discovered that docker version --format '{{.Server.Version }}' now includes an operating system identifier, e.g. -ol, which makes the current -lt test fail as it expects to compare integers.

This pull request includes a commit to remove the operating system identifier from the docker version, if present.

I've also taken the opportunity the clean up trailing and inconsistent whitespace in the file.

For references my environment is:

oracle-contributor-agreement[bot] commented 7 months ago

Thank you for your pull request and welcome to our community! To contribute, please sign the Oracle Contributor Agreement (OCA). The following contributors of this PR have not signed the OCA:

To sign the OCA, please create an Oracle account and sign the OCA in Oracle's Contributor Agreement Application.

When signing the OCA, please provide your GitHub username. After signing the OCA and getting an OCA approval from Oracle, this PR will be automatically updated.

If you are an Oracle employee, please make sure that you are a member of the main Oracle GitHub organization, and your membership in this organization is public.