Skip to content
This repository has been archived by the owner on Jan 23, 2024. It is now read-only.

Support ubi8 docker images #931

Merged
merged 5 commits into from
Sep 22, 2020

Conversation

v1v
Copy link
Member

@v1v v1v commented Sep 21, 2020

What does this PR do?

Add --ubi8 option to use ubi8 docker images. Verify --oss and --ubi8 options are not enabled at the same time.

Why is it important?

Support the ITs with the ubi8 minimal docker images locally and also in the CI as part of the compatibility matrix.

Related issues

Closes #900

Tests

  • locally
$ BUILD_OPTS="--ubi8" ELASTIC_STACK_VERSION="8.0.0" .ci/scripts/go.sh
$ grep 'ubi8' docker-compose.yml 
      "image": "docker.elastic.co/apm/apm-server-ubi8:8.0.0-SNAPSHOT",
      "image": "docker.elastic.co/elasticsearch/elasticsearch-ubi8:8.0.0-SNAPSHOT",
$ docker ps
CONTAINER ID        IMAGE                                                               COMMAND                  CREATED             STATUS                            PORTS                                                                                                        NAMES
f4378529d269        docker.elastic.co/apm/apm-server-ubi8:8.0.0-SNAPSHOT                "/usr/local/bin/dock…"   9 seconds ago       Up 8 seconds (health: starting)   127.0.0.1:6060->6060/tcp, 127.0.0.1:8200->8200/tcp, 127.0.0.1:14250->14250/tcp, 127.0.0.1:14268->14268/tcp   localtesting_8.0.0_apm-server
a78a0dbc8094        docker.elastic.co/elasticsearch/elasticsearch-ubi8:8.0.0-SNAPSHOT   "/tini -- /usr/local…"   40 seconds ago      Up 39 seconds (healthy)           127.0.0.1:9200->9200/tcp, 9300/tcp                                                                           localtesting_8.0.0_elasticsearch

@v1v v1v self-assigned this Sep 21, 2020
@v1v v1v requested review from axw and a team September 21, 2020 10:02
Copy link
Member

@axw axw left a comment

Choose a reason for hiding this comment

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

LGTM, thank you! Just one small comment about the binary name and:

  • I think Logstash is missing?
  • Could we please add UBI8 to the integration testing matrix?

scripts/modules/elastic_stack.py Outdated Show resolved Hide resolved
@apmmachine
Copy link
Collaborator

apmmachine commented Sep 21, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Started by timer]

  • Start Time: 2020-09-22T03:02:00.761+0000

  • Duration: 38 min 41 sec

Test stats 🧪

Test Results
Failed 0
Passed 416
Skipped 12
Total 428

Copy link
Member

@axw axw left a comment

Choose a reason for hiding this comment

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

Perfect, thank you!

@v1v v1v merged commit 500397a into elastic:master Sep 22, 2020
@v1v v1v deleted the feature/support-ubi8-docker-images branch September 22, 2020 08:19
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add option to run UBI8-minimal based stack images
4 participants