yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-11-04 04:29:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(chore): Prepare Main Branch with next release (1.2.0) (#12364)

Browse Source 
* Updating Dockerfile with multistage

* Updating reviewed changes

* Docker Development changes

* Docker workflow changes

* Arguments update

* Script path update

* Arguments update

* Resolving the reviewed suggestions

* Preparing for next release and updating docker sort value changes

* Adding .dev0 in the python related release version

* Adding .dev0 in the python related release version
This commit is contained in:
Anuj359 2023-07-12 13:25:18 +02:00 committed by GitHub
parent 7b89c5fefc
commit 7f55b808e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/docker-openmetadata-db.yml vendored
View File

@ -31,7 +31,7 @@ jobs:
steps: steps:
- name: Check trigger type - name: Check trigger type
if: ${{ env.input == '' }} if: ${{ env.input == '' }}
run: echo "input=1.0.0-alpha" >> $GITHUB_ENV run: echo "input=1.2.0" >> $GITHUB_ENV
- name: Check out the Repo - name: Check out the Repo
uses: actions/checkout@v3 uses: actions/checkout@v3

2
.github/workflows/docker-openmetadata-ingestion-base.yml vendored
View File

@ -31,7 +31,7 @@ jobs:
steps: steps:
- name: Check trigger type - name: Check trigger type
if: ${{ env.input == '' }} if: ${{ env.input == '' }}
run: echo "input=1.0.0-alpha" >> $GITHUB_ENV run: echo "input=1.2.0" >> $GITHUB_ENV
- name: Check out the Repo - name: Check out the Repo
uses: actions/checkout@v3 uses: actions/checkout@v3

2
.github/workflows/docker-openmetadata-ingestion.yml vendored
View File

@ -31,7 +31,7 @@ jobs:
steps: steps:
- name: Check trigger type - name: Check trigger type
if: ${{ env.input == '' }} if: ${{ env.input == '' }}
run: echo "input=1.0.0-alpha" >> $GITHUB_ENV run: echo "input=1.2.0" >> $GITHUB_ENV
- name: Check out the Repo - name: Check out the Repo
uses: actions/checkout@v3 uses: actions/checkout@v3

2
.github/workflows/docker-openmetadata-postgres.yml vendored
View File

@ -31,7 +31,7 @@ jobs:
steps: steps:
- name: Check trigger type - name: Check trigger type
if: ${{ env.input == '' }} if: ${{ env.input == '' }}
run: echo "input=1.0.0-alpha" >> $GITHUB_ENV run: echo "input=1.2.0" >> $GITHUB_ENV
- name: Check out the Repo - name: Check out the Repo
uses: actions/checkout@v3 uses: actions/checkout@v3

4
.github/workflows/docker-openmetadata-server.yml vendored
View File

@ -63,7 +63,7 @@ jobs:
steps: steps:
- name: Check trigger type - name: Check trigger type
id: check_trigger id: check_trigger
run: echo "DOCKER_RELEASE_TAG=1.1.0-beta" >> $GITHUB_OUTPUT run: echo "DOCKER_RELEASE_TAG=1.2.0" >> $GITHUB_OUTPUT
- name: Download application from Artifiact - name: Download application from Artifiact
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
@ -128,7 +128,7 @@ jobs:
- name: Check trigger type - name: Check trigger type
id: check_trigger id: check_trigger
if: ${{ env.DOCKER_RELEASE_TAG == '' }} if: ${{ env.DOCKER_RELEASE_TAG == '' }}
run: echo "DOCKER_RELEASE_TAG=1.1.0-beta" >> $GITHUB_ENV run: echo "DOCKER_RELEASE_TAG=1.2.0" >> $GITHUB_ENV
- name: Check out the Repo - name: Check out the Repo
uses: actions/checkout@v3 uses: actions/checkout@v3

1
docker/development/docker-compose-postgres.yml
View File

@ -20,6 +20,7 @@ services:
build: build:
context: ../../. context: ../../.
dockerfile: docker/postgresql/Dockerfile_postgres dockerfile: docker/postgresql/Dockerfile_postgres
command: "--sort_buffer_size=10M"
container_name: openmetadata_postgresql container_name: openmetadata_postgresql
restart: always restart: always
depends_on: depends_on:

1
docker/development/docker-compose.yml
View File

@ -20,6 +20,7 @@ services:
build: build:
context: ../../. context: ../../.
dockerfile: docker/mysql/Dockerfile_mysql dockerfile: docker/mysql/Dockerfile_mysql
command: "--sort_buffer_size=10M"
container_name: openmetadata_mysql container_name: openmetadata_mysql
restart: always restart: always
depends_on: depends_on:

2
docker/docker-compose-ingestion/docker-compose-ingestion-postgres.yml
View File

@ -18,7 +18,7 @@ volumes:
services: services:
ingestion: ingestion:
container_name: openmetadata_ingestion container_name: openmetadata_ingestion
image: docker.getcollate.io/openmetadata/ingestion:1.0.1 image: docker.getcollate.io/openmetadata/ingestion:1.2.0
depends_on: depends_on:
elasticsearch: elasticsearch:
condition: service_started condition: service_started

2
docker/docker-compose-ingestion/docker-compose-ingestion.yml
View File

@ -18,7 +18,7 @@ volumes:
services: services:
ingestion: ingestion:
container_name: openmetadata_ingestion container_name: openmetadata_ingestion
image: docker.getcollate.io/openmetadata/ingestion:1.0.1 image: docker.getcollate.io/openmetadata/ingestion:1.2.0
environment: environment:
AIRFLOW__API__AUTH_BACKENDS: "airflow.api.auth.backend.basic_auth,airflow.api.auth.backend.session" AIRFLOW__API__AUTH_BACKENDS: "airflow.api.auth.backend.basic_auth,airflow.api.auth.backend.session"
AIRFLOW__CORE__EXECUTOR: LocalExecutor AIRFLOW__CORE__EXECUTOR: LocalExecutor

4
docker/docker-compose-ingestion/env-mysql
View File

@ -7,5 +7,5 @@ AIRFLOW_DB_HOST="mysql"
AIRFLOW_DB_PORT="3306" AIRFLOW_DB_PORT="3306"
AIRFLOW_DB="airflow_db" AIRFLOW_DB="airflow_db"
AIRFLOW_DB_SCHEME="mysql+pymysql" AIRFLOW_DB_SCHEME="mysql+pymysql"
DB_USER="airflow_user" AIRFLOW_DB_USER="airflow_user"
DB_PASSWORD="airflow_pass" AIRFLOW_DB_PASSWORD="airflow_pass"

3
docker/docker-compose-openmetadata/docker-compose-openmetadata-postgres.yml
View File

@ -14,7 +14,8 @@ services:
openmetadata-server: openmetadata-server:
container_name: openmetadata_server container_name: openmetadata_server
restart: always restart: always
image: docker.getcollate.io/openmetadata/server:1.0.1 image: docker.getcollate.io/openmetadata/server:1.2.0
command: "--sort_buffer_size=10M"
environment: environment:
OPENMETADATA_CLUSTER_NAME: ${OPENMETADATA_CLUSTER_NAME:-openmetadata} OPENMETADATA_CLUSTER_NAME: ${OPENMETADATA_CLUSTER_NAME:-openmetadata}
SERVER_PORT: ${SERVER_PORT:-8585} SERVER_PORT: ${SERVER_PORT:-8585}

3
docker/docker-compose-openmetadata/docker-compose-openmetadata.yml
View File

@ -14,7 +14,8 @@ services:
openmetadata-server: openmetadata-server:
container_name: openmetadata_server container_name: openmetadata_server
restart: always restart: always
image: docker.getcollate.io/openmetadata/server:1.0.1 image: docker.getcollate.io/openmetadata/server:1.2.0
command: "--sort_buffer_size=10M"
environment: environment:
OPENMETADATA_CLUSTER_NAME: ${OPENMETADATA_CLUSTER_NAME:-openmetadata} OPENMETADATA_CLUSTER_NAME: ${OPENMETADATA_CLUSTER_NAME:-openmetadata}
SERVER_PORT: ${SERVER_PORT:-8585} SERVER_PORT: ${SERVER_PORT:-8585}

4
docker/docker-compose-quickstart/Dockerfile
View File

@ -11,7 +11,7 @@
# Build stage # Build stage
FROM alpine:3.15 AS build FROM alpine:3.15 AS build
ENV RELEASE_URL="https://github.com/open-metadata/OpenMetadata/releases/download/1.0.0-alpha-release/openmetadata-1.0.0-alpha.tar.gz" ENV RELEASE_URL="https://github.com/open-metadata/OpenMetadata/releases/download/1.2.0-release/openmetadata-1.2.0.tar.gz"
RUN mkdir -p /opt/openmetadata && \ RUN mkdir -p /opt/openmetadata && \
wget ${RELEASE_URL} && \ wget ${RELEASE_URL} && \
tar zxvf openmetadata-*.tar.gz -C /opt/openmetadata --strip-components 1 && \ tar zxvf openmetadata-*.tar.gz -C /opt/openmetadata --strip-components 1 && \
@ -24,7 +24,7 @@ ARG COMMIT_ID
LABEL maintainer="OpenMetadata" LABEL maintainer="OpenMetadata"
LABEL org.open-metadata.image.authors="support@openmetadata.org" LABEL org.open-metadata.image.authors="support@openmetadata.org"
LABEL org.open-metadata.vendor="OpenMetadata" LABEL org.open-metadata.vendor="OpenMetadata"
LABEL org.open-metadata.release-version="1.0.0-alpha" LABEL org.open-metadata.release-version="1.2.0"
LABEL org.open-metadata.description="OpenMetadata is an open source platform for metadata management and discovery." LABEL org.open-metadata.description="OpenMetadata is an open source platform for metadata management and discovery."
LABEL org.open-metadata.url="https://open-metadata.org/" LABEL org.open-metadata.url="https://open-metadata.org/"
LABEL org.open-metadata.vcs-url="https://github.com/open-metadata/OpenMetadata" LABEL org.open-metadata.vcs-url="https://github.com/open-metadata/OpenMetadata"

2
docker/docker-compose-quickstart/docker-compose-postgres.yml
View File

@ -18,7 +18,7 @@ volumes:
services: services:
postgresql: postgresql:
container_name: openmetadata_postgresql container_name: openmetadata_postgresql
image: docker.getcollate.io/openmetadata/postgresql:1.0.1 image: docker.getcollate.io/openmetadata/postgresql:1.2.0
restart: always restart: always
environment: environment:
POSTGRES_USER: postgres POSTGRES_USER: postgres

2
docker/docker-compose-quickstart/docker-compose.yml
View File

@ -18,7 +18,7 @@ volumes:
services: services:
mysql: mysql:
container_name: openmetadata_mysql container_name: openmetadata_mysql
image: docker.getcollate.io/openmetadata/db:1.0.1 image: docker.getcollate.io/openmetadata/db:1.2.0
command: "--sort_buffer_size=10M" command: "--sort_buffer_size=10M"
restart: always restart: always
environment: environment:

4
ingestion/Dockerfile
View File

@ -75,8 +75,8 @@ USER airflow
# Argument to provide for Ingestion Dependencies to install. Defaults to all # Argument to provide for Ingestion Dependencies to install. Defaults to all
ARG INGESTION_DEPENDENCY="all" ARG INGESTION_DEPENDENCY="all"
RUN pip install --upgrade pip RUN pip install --upgrade pip
RUN pip install "openmetadata-managed-apis==1.0.0.0.dev0" --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-2.3.3/constraints-3.9.txt" RUN pip install "openmetadata-managed-apis==1.2.0.0.dev0" --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-2.3.3/constraints-3.9.txt"
RUN pip install "openmetadata-ingestion[${INGESTION_DEPENDENCY}]==1.0.0.0.dev0" RUN pip install "openmetadata-ingestion[${INGESTION_DEPENDENCY}]==1.2.0.0.dev0"
# Temporary workaround for https://github.com/open-metadata/OpenMetadata/issues/9593 # Temporary workaround for https://github.com/open-metadata/OpenMetadata/issues/9593
RUN echo "Image built for $(uname -m)" RUN echo "Image built for $(uname -m)"

4
ingestion/operators/docker/Dockerfile
View File

@ -80,8 +80,8 @@ RUN pip install --upgrade pip
ARG INGESTION_DEPENDENCY="all" ARG INGESTION_DEPENDENCY="all"
RUN pip install --upgrade pip RUN pip install --upgrade pip
RUN pip install "openmetadata-ingestion[airflow]~=1.0.4" RUN pip install "openmetadata-ingestion[airflow]~=1.2.0.0.dev0"
RUN pip install "openmetadata-ingestion[${INGESTION_DEPENDENCY}]~=1.0.4" RUN pip install "openmetadata-ingestion[${INGESTION_DEPENDENCY}]~=1.2.0.0.dev0"
# Temporary workaround for https://github.com/open-metadata/OpenMetadata/issues/9593 # Temporary workaround for https://github.com/open-metadata/OpenMetadata/issues/9593
RUN echo "Image built for $(uname -m)" RUN echo "Image built for $(uname -m)"

2
ingestion/setup.py
View File

@ -265,7 +265,7 @@ test = {
build_options = {"includes": ["_cffi_backend"]} build_options = {"includes": ["_cffi_backend"]}
setup( setup(
name="openmetadata-ingestion", name="openmetadata-ingestion",
version="1.1.0.0.dev0", version="1.2.0.0.dev0",
url="https://open-metadata.org/", url="https://open-metadata.org/",
author="OpenMetadata Committers", author="OpenMetadata Committers",
license="Apache License 2.0", license="Apache License 2.0",

2
openmetadata-airflow-apis/setup.py
View File

@ -69,7 +69,7 @@ setup(
packages=find_packages(include=[f"{PLUGIN_NAME}.*", PLUGIN_NAME]), packages=find_packages(include=[f"{PLUGIN_NAME}.*", PLUGIN_NAME]),
include_package_data=True, include_package_data=True,
package_data={PLUGIN_NAME: get_package_data()}, package_data={PLUGIN_NAME: get_package_data()},
version="1.1.0.0.dev0", version="1.2.0.0.dev0",
url="https://open-metadata.org/", url="https://open-metadata.org/",
author="OpenMetadata Committers", author="OpenMetadata Committers",
license="Apache License 2.0", license="Apache License 2.0",

2
pom.xml
View File

@ -26,7 +26,7 @@
based on Open Metadata Standards/APIs, supporting connectors to a wide range of data services, based on Open Metadata Standards/APIs, supporting connectors to a wide range of data services,
OpenMetadata enables end-to-end metadata management, giving you the freedom to unlock the value of your data assets. OpenMetadata enables end-to-end metadata management, giving you the freedom to unlock the value of your data assets.
</description> </description>
<version>1.1.0-SNAPSHOT</version> <version>1.2.0-SNAPSHOT</version>
<url>https://github.com/open-metadata/OpenMetadata</url> <url>https://github.com/open-metadata/OpenMetadata</url>
<modules> <modules>
<module>openmetadata-spec</module> <module>openmetadata-spec</module>