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

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

nasmart
Copy link

@nasmart nasmart commented Mar 5, 2024

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 Linux Server release 7.9
  • Docker 19.03.11-ol

`docker version` now includes an OS identifier, which must be removed in
order to perform the version check using the current test.
@nasmart nasmart requested a review from gvenzl as a code owner March 5, 2024 22:31
Copy link

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.

@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Required At least one contributor does not have an approved Oracle Contributor Agreement. label Mar 5, 2024
@gvenzl gvenzl requested a review from yunus-qureshi May 15, 2024 18:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
database OCA Required At least one contributor does not have an approved Oracle Contributor Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants