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

* 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
open-metadata · Jul 12, 2023 · 7f55b80 · 7f55b80
1 parent 7b89c5f
commit 7f55b80
Show file tree

Hide file tree

Showing 20 changed files with 27 additions and 23 deletions.
diff --git a/.github/workflows/docker-openmetadata-db.yml b/.github/workflows/docker-openmetadata-db.yml
@@ -31,7 +31,7 @@ jobs:
     steps:
       - name: Check trigger type
         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
         uses: actions/checkout@v3

diff --git a/.github/workflows/docker-openmetadata-ingestion-base.yml b/.github/workflows/docker-openmetadata-ingestion-base.yml
@@ -31,7 +31,7 @@ jobs:
     steps:
       - name: Check trigger type
         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
         uses: actions/checkout@v3

diff --git a/.github/workflows/docker-openmetadata-ingestion.yml b/.github/workflows/docker-openmetadata-ingestion.yml
@@ -31,7 +31,7 @@ jobs:
     steps:
       - name: Check trigger type
         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
         uses: actions/checkout@v3

diff --git a/.github/workflows/docker-openmetadata-postgres.yml b/.github/workflows/docker-openmetadata-postgres.yml
@@ -31,7 +31,7 @@ jobs:
     steps:
       - name: Check trigger type
         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
         uses: actions/checkout@v3

diff --git a/.github/workflows/docker-openmetadata-server.yml b/.github/workflows/docker-openmetadata-server.yml
@@ -63,7 +63,7 @@ jobs:
     steps:
       - name: Check trigger type
         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
         uses: actions/download-artifact@v2
@@ -128,7 +128,7 @@ jobs:
       - name: Check trigger type
         id: check_trigger
         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
         uses: actions/checkout@v3

diff --git a/docker/development/docker-compose-postgres.yml b/docker/development/docker-compose-postgres.yml
@@ -20,6 +20,7 @@ services:
     build:
       context: ../../.
       dockerfile: docker/postgresql/Dockerfile_postgres
+    command: "--sort_buffer_size=10M"
     container_name: openmetadata_postgresql
     restart: always
     depends_on:

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

diff --git a/docker/docker-compose-ingestion/docker-compose-ingestion-postgres.yml b/docker/docker-compose-ingestion/docker-compose-ingestion-postgres.yml
@@ -18,7 +18,7 @@ volumes:
 services:  
   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:
       elasticsearch:
         condition: service_started

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

diff --git a/docker/docker-compose-ingestion/env-mysql b/docker/docker-compose-ingestion/env-mysql
@@ -7,5 +7,5 @@ AIRFLOW_DB_HOST="mysql"
 AIRFLOW_DB_PORT="3306"
 AIRFLOW_DB="airflow_db"
 AIRFLOW_DB_SCHEME="mysql+pymysql"
-DB_USER="airflow_user"
-DB_PASSWORD="airflow_pass"
+AIRFLOW_DB_USER="airflow_user"
+AIRFLOW_DB_PASSWORD="airflow_pass"
diff --git a/docker/docker-compose-openmetadata/docker-compose-openmetadata-postgres.yml b/docker/docker-compose-openmetadata/docker-compose-openmetadata-postgres.yml
@@ -14,7 +14,8 @@ services:
   openmetadata-server:
     container_name: openmetadata_server
     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:
       OPENMETADATA_CLUSTER_NAME: ${OPENMETADATA_CLUSTER_NAME:-openmetadata}
       SERVER_PORT: ${SERVER_PORT:-8585}

diff --git a/docker/docker-compose-openmetadata/docker-compose-openmetadata.yml b/docker/docker-compose-openmetadata/docker-compose-openmetadata.yml
@@ -14,7 +14,8 @@ services:
   openmetadata-server:
     container_name: openmetadata_server
     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:
       OPENMETADATA_CLUSTER_NAME: ${OPENMETADATA_CLUSTER_NAME:-openmetadata}
       SERVER_PORT: ${SERVER_PORT:-8585}

diff --git a/docker/docker-compose-quickstart/Dockerfile b/docker/docker-compose-quickstart/Dockerfile
@@ -11,7 +11,7 @@
 
 # Build stage
 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 && \
     wget ${RELEASE_URL} && \
     tar zxvf openmetadata-*.tar.gz -C /opt/openmetadata --strip-components 1 && \
@@ -24,7 +24,7 @@ ARG COMMIT_ID
 LABEL maintainer="OpenMetadata"
 LABEL org.open-metadata.image.authors="support@openmetadata.org"
 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.url="https://open-metadata.org/"
 LABEL org.open-metadata.vcs-url="https://github.com/open-metadata/OpenMetadata"

diff --git a/docker/docker-compose-quickstart/docker-compose-postgres.yml b/docker/docker-compose-quickstart/docker-compose-postgres.yml
@@ -18,7 +18,7 @@ volumes:
 services:
   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
     environment:
       POSTGRES_USER: postgres

diff --git a/docker/docker-compose-quickstart/docker-compose.yml b/docker/docker-compose-quickstart/docker-compose.yml
@@ -18,7 +18,7 @@ volumes:
 services:
   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"
     restart: always
     environment:

diff --git a/ingestion/Dockerfile b/ingestion/Dockerfile
@@ -75,8 +75,8 @@ USER airflow
 # Argument to provide for Ingestion Dependencies to install. Defaults to all
 ARG INGESTION_DEPENDENCY="all"
 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-ingestion[${INGESTION_DEPENDENCY}]==1.0.0.0.dev0"
+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.2.0.0.dev0"
 
 # Temporary workaround for https://github.com/open-metadata/OpenMetadata/issues/9593
 RUN echo "Image built for $(uname -m)"

diff --git a/ingestion/operators/docker/Dockerfile b/ingestion/operators/docker/Dockerfile
@@ -80,8 +80,8 @@ RUN pip install --upgrade pip
 
 ARG INGESTION_DEPENDENCY="all"
 RUN pip install --upgrade pip
-RUN pip install "openmetadata-ingestion[airflow]~=1.0.4"
-RUN pip install "openmetadata-ingestion[${INGESTION_DEPENDENCY}]~=1.0.4"
+RUN pip install "openmetadata-ingestion[airflow]~=1.2.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
 RUN echo "Image built for $(uname -m)"

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

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

diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
     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.
   </description>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <url>https://github.com/open-metadata/OpenMetadata</url>
   <modules>
     <module>openmetadata-spec</module>