From 028cf1897e477ae254365a896cd02f3fe5f1ec9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Ho=CC=88nicke?= Date: Thu, 4 May 2023 10:23:36 +0200 Subject: [PATCH 01/13] =?UTF-8?q?=F0=9F=90=8B=20feat:=20docker=20base=20im?= =?UTF-8?q?age?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/push-docker-base-image.yml | 30 +++++++++++++++++++ src/options/generate/static_files/__init__.py | 0 .../static_files/base_image/Dockerfile | 7 +++++ .../static_files/microservice/Dockerfile | 4 +-- 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/push-docker-base-image.yml delete mode 100644 src/options/generate/static_files/__init__.py create mode 100644 src/options/generate/static_files/base_image/Dockerfile diff --git a/.github/workflows/push-docker-base-image.yml b/.github/workflows/push-docker-base-image.yml new file mode 100644 index 0000000..927c939 --- /dev/null +++ b/.github/workflows/push-docker-base-image.yml @@ -0,0 +1,30 @@ +name: Push docker base image + +on: + push: + branches: + - main + pull_request: + +jobs: + build-and-push: + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Login to Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_DEVBOT_USER }} + password: ${{ secrets.DOCKERHUB_DEVBOT_PWD }} + + - name: Build and Push Docker Image + uses: docker/build-push-action@v2 + with: + context: src/options/generate/static_files/base_image + push: true + tags: jina/gpt-dev:latest \ No newline at end of file diff --git a/src/options/generate/static_files/__init__.py b/src/options/generate/static_files/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/options/generate/static_files/base_image/Dockerfile b/src/options/generate/static_files/base_image/Dockerfile new file mode 100644 index 0000000..8373c07 --- /dev/null +++ b/src/options/generate/static_files/base_image/Dockerfile @@ -0,0 +1,7 @@ +FROM jinaai/jina:3.14.1-py39-standard + +# update pip +RUN pip install --upgrade pip + +# install media dependencies +RUN apt-get update && apt-get install --no-install-recommends -y ffmpeg build-essential pkg-config libpoppler-cpp-dev {{apt_get_packages}} \ No newline at end of file diff --git a/src/options/generate/static_files/microservice/Dockerfile b/src/options/generate/static_files/microservice/Dockerfile index 681ad0c..5d4e97e 100644 --- a/src/options/generate/static_files/microservice/Dockerfile +++ b/src/options/generate/static_files/microservice/Dockerfile @@ -1,8 +1,8 @@ -FROM jinaai/jina:3.14.1-py39-standard +FROM jinaai/gpt-dev:latest # update pip RUN pip install --upgrade pip -RUN apt-get update && apt-get install --no-install-recommends -y ffmpeg build-essential pkg-config libpoppler-cpp-dev {{apt_get_packages}} && apt-get clean && rm -rf /var/lib/apt/lists/* +RUN apt-get install --no-install-recommends -y {{apt_get_packages}} ## install requirements for the executor COPY requirements.txt . From f049ab61346d6e46b62e5df899493370bca5d541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Ho=CC=88nicke?= Date: Thu, 4 May 2023 10:30:36 +0200 Subject: [PATCH 02/13] =?UTF-8?q?=F0=9F=90=8B=20feat:=20docker=20base=20im?= =?UTF-8?q?age?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/options/generate/static_files/base_image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/options/generate/static_files/base_image/Dockerfile b/src/options/generate/static_files/base_image/Dockerfile index 8373c07..33924d6 100644 --- a/src/options/generate/static_files/base_image/Dockerfile +++ b/src/options/generate/static_files/base_image/Dockerfile @@ -4,4 +4,4 @@ FROM jinaai/jina:3.14.1-py39-standard RUN pip install --upgrade pip # install media dependencies -RUN apt-get update && apt-get install --no-install-recommends -y ffmpeg build-essential pkg-config libpoppler-cpp-dev {{apt_get_packages}} \ No newline at end of file +RUN apt-get update && apt-get install --no-install-recommends -y ffmpeg build-essential pkg-config libpoppler-cpp-dev \ No newline at end of file From 87e5e6a99d4dad5f768c0a438ac8e7ff4cdc6b03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Ho=CC=88nicke?= Date: Thu, 4 May 2023 10:33:28 +0200 Subject: [PATCH 03/13] =?UTF-8?q?=F0=9F=90=8B=20feat:=20docker=20base=20im?= =?UTF-8?q?age?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/push-docker-base-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-docker-base-image.yml b/.github/workflows/push-docker-base-image.yml index 927c939..a7d4c14 100644 --- a/.github/workflows/push-docker-base-image.yml +++ b/.github/workflows/push-docker-base-image.yml @@ -27,4 +27,4 @@ jobs: with: context: src/options/generate/static_files/base_image push: true - tags: jina/gpt-dev:latest \ No newline at end of file + tags: jinaai/gpt-dev:latest \ No newline at end of file From e44459e13f2cddf23e93c7fecb55363eefb65d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Ho=CC=88nicke?= Date: Thu, 4 May 2023 11:00:16 +0200 Subject: [PATCH 04/13] =?UTF-8?q?=F0=9F=90=8B=20feat:=20docker=20base=20im?= =?UTF-8?q?age?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/push-docker-base-image.yml | 34 +++++++++++++++++++- src/constants.py | 3 ++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push-docker-base-image.yml b/.github/workflows/push-docker-base-image.yml index a7d4c14..48fcb2c 100644 --- a/.github/workflows/push-docker-base-image.yml +++ b/.github/workflows/push-docker-base-image.yml @@ -13,18 +13,50 @@ jobs: - name: Checkout Repository uses: actions/checkout@v2 + - name: Check if code relevant to executor has changed + uses: dorny/paths-filter@v2 + id: check + with: + filters: | + changed: + - src/options/generate/static_files/base_image/** + + - name: Get base image tag + if: steps.check.outputs.changed == 'true' + shell: bash + run: | + FILE='scr/constants.py' + VERSION=$(sed -n '/DOCKER_BASE_IMAGE_VERSION =/p' $FILE | cut -d \' -f2) + echo "VERSION=$VERSION" >> $GITHUB_ENV + + - name: Check that tag isn't used already for the docker base image + if: steps.check.outputs.changed == 'true' + env: + VERSION: ${{ env.VERSION }} + shell: bash + run: | + if jina hub pull jinahub+docker://jinaai/gpt-dev/$VERSION; then + echo "Executor version/tag is used already. Please update the tag" + exit 1 + else + echo "Executor version/tag isn't used already, continue to build..." + fi + - name: Set up Docker Buildx + if: steps.check.outputs.changed == 'true' uses: docker/setup-buildx-action@v1 - name: Login to Docker Hub + if: steps.check.outputs.changed == 'true' uses: docker/login-action@v1 with: username: ${{ secrets.DOCKERHUB_DEVBOT_USER }} password: ${{ secrets.DOCKERHUB_DEVBOT_PWD }} - name: Build and Push Docker Image + if: steps.check.outputs.changed == 'true' uses: docker/build-push-action@v2 with: context: src/options/generate/static_files/base_image push: true - tags: jinaai/gpt-dev:latest \ No newline at end of file + tags: jinaai/gpt-dev:$VERSION \ No newline at end of file diff --git a/src/constants.py b/src/constants.py index 08833b4..ef527c3 100644 --- a/src/constants.py +++ b/src/constants.py @@ -1,3 +1,5 @@ +DOCKER_BASE_IMAGE_VERSION = '0.0.1' + EXECUTOR_FILE_NAME = '__init__.py' IMPLEMENTATION_FILE_NAME = 'microservice.py' TEST_EXECUTOR_FILE_NAME = 'test_microservice.py' @@ -51,3 +53,4 @@ LANGUAGE_PACKAGES = [ 'pattern', 'polyglot', 'pytorch-transformers', 'rasa', 'sentence-transformers', 'spacy', 'stanza', 'summarizer', 'sumy', 'textblob', 'textstat', 'transformers' ] + From 223defe9fb26358b48be3b29d965faa72b9ddc71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Ho=CC=88nicke?= Date: Thu, 4 May 2023 11:01:45 +0200 Subject: [PATCH 05/13] =?UTF-8?q?=F0=9F=90=8B=20feat:=20docker=20base=20im?= =?UTF-8?q?age?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/push-docker-base-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-docker-base-image.yml b/.github/workflows/push-docker-base-image.yml index 48fcb2c..41bbefb 100644 --- a/.github/workflows/push-docker-base-image.yml +++ b/.github/workflows/push-docker-base-image.yml @@ -25,7 +25,7 @@ jobs: if: steps.check.outputs.changed == 'true' shell: bash run: | - FILE='scr/constants.py' + FILE='src/constants.py' VERSION=$(sed -n '/DOCKER_BASE_IMAGE_VERSION =/p' $FILE | cut -d \' -f2) echo "VERSION=$VERSION" >> $GITHUB_ENV From bb7878bdb3f818ccac5ade3b284db5b132f4fe23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Ho=CC=88nicke?= Date: Thu, 4 May 2023 11:06:00 +0200 Subject: [PATCH 06/13] =?UTF-8?q?=F0=9F=90=8B=20feat:=20docker=20base=20im?= =?UTF-8?q?age?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 2 +- .github/workflows/push-docker-base-image.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a56cc2c..025dbb0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,7 @@ name: CI on: workflow_dispatch: - pull_request: +# pull_request: jobs: test_cognitive_level: diff --git a/.github/workflows/push-docker-base-image.yml b/.github/workflows/push-docker-base-image.yml index 41bbefb..0c52390 100644 --- a/.github/workflows/push-docker-base-image.yml +++ b/.github/workflows/push-docker-base-image.yml @@ -35,7 +35,7 @@ jobs: VERSION: ${{ env.VERSION }} shell: bash run: | - if jina hub pull jinahub+docker://jinaai/gpt-dev/$VERSION; then + if docker pull jinaai/gpt-dev:$VERSION; then echo "Executor version/tag is used already. Please update the tag" exit 1 else From 0854e9441c41bfc11bcec0b8f027a11553a7722c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Ho=CC=88nicke?= Date: Thu, 4 May 2023 11:13:43 +0200 Subject: [PATCH 07/13] =?UTF-8?q?=F0=9F=90=8B=20feat:=20docker=20base=20im?= =?UTF-8?q?age?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/push-docker-base-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-docker-base-image.yml b/.github/workflows/push-docker-base-image.yml index 0c52390..8c22bd7 100644 --- a/.github/workflows/push-docker-base-image.yml +++ b/.github/workflows/push-docker-base-image.yml @@ -59,4 +59,4 @@ jobs: with: context: src/options/generate/static_files/base_image push: true - tags: jinaai/gpt-dev:$VERSION \ No newline at end of file + tags: jinaai/gpt-dev:${{ env.VERSION }} \ No newline at end of file From 3204d893e18ac1b364650edd94d57830004cc285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Ho=CC=88nicke?= Date: Thu, 4 May 2023 11:23:00 +0200 Subject: [PATCH 08/13] =?UTF-8?q?=F0=9F=90=8B=20feat:=20docker=20base=20im?= =?UTF-8?q?age?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 54 ++++++++++++++++ .github/workflows/push-docker-base-image.yml | 62 ------------------- src/constants.py | 2 +- src/options/generate/generator.py | 8 +-- .../static_files/microservice/Dockerfile | 6 +- src/options/generate/templates_user.py | 6 +- 6 files changed, 64 insertions(+), 74 deletions(-) delete mode 100644 .github/workflows/push-docker-base-image.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 025dbb0..621d825 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,3 +59,57 @@ jobs: SCENEX_API_KEY: ${{ secrets.SCENEX_API_KEY }} WHISPER_API_KEY: ${{ secrets.WHISPER_API_KEY }} + build-and-push: + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v2 + + - name: Check if code relevant to executor has changed + uses: dorny/paths-filter@v2 + id: check + with: + filters: | + changed: + - src/options/generate/static_files/base_image/** + + - name: Get base image tag + if: steps.check.outputs.changed == 'true' + shell: bash + run: | + FILE='src/constants.py' + VERSION=$(sed -n '/DOCKER_BASE_IMAGE_VERSION =/p' $FILE | cut -d \' -f2) + echo "VERSION=$VERSION" >> $GITHUB_ENV + + - name: Check that tag isn't used already for the docker base image + if: steps.check.outputs.changed == 'true' + env: + VERSION: ${{ env.VERSION }} + shell: bash + run: | + if docker pull jinaai/gpt-dev:$VERSION; then + echo "Executor version/tag is used already. Please update the tag" + exit 1 + else + echo "Executor version/tag isn't used already, continue to build..." + fi + + - name: Set up Docker Buildx + if: steps.check.outputs.changed == 'true' + uses: docker/setup-buildx-action@v1 + + - name: Login to Docker Hub + if: steps.check.outputs.changed == 'true' + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_DEVBOT_USER }} + password: ${{ secrets.DOCKERHUB_DEVBOT_PWD }} + + - name: Build and Push Docker Image + if: steps.check.outputs.changed == 'true' + uses: docker/build-push-action@v2 + with: + context: src/options/generate/static_files/base_image + push: true + tags: jinaai/gpt-dev:${{ env.VERSION }} + diff --git a/.github/workflows/push-docker-base-image.yml b/.github/workflows/push-docker-base-image.yml deleted file mode 100644 index 8c22bd7..0000000 --- a/.github/workflows/push-docker-base-image.yml +++ /dev/null @@ -1,62 +0,0 @@ -name: Push docker base image - -on: - push: - branches: - - main - pull_request: - -jobs: - build-and-push: - runs-on: ubuntu-latest - steps: - - name: Checkout Repository - uses: actions/checkout@v2 - - - name: Check if code relevant to executor has changed - uses: dorny/paths-filter@v2 - id: check - with: - filters: | - changed: - - src/options/generate/static_files/base_image/** - - - name: Get base image tag - if: steps.check.outputs.changed == 'true' - shell: bash - run: | - FILE='src/constants.py' - VERSION=$(sed -n '/DOCKER_BASE_IMAGE_VERSION =/p' $FILE | cut -d \' -f2) - echo "VERSION=$VERSION" >> $GITHUB_ENV - - - name: Check that tag isn't used already for the docker base image - if: steps.check.outputs.changed == 'true' - env: - VERSION: ${{ env.VERSION }} - shell: bash - run: | - if docker pull jinaai/gpt-dev:$VERSION; then - echo "Executor version/tag is used already. Please update the tag" - exit 1 - else - echo "Executor version/tag isn't used already, continue to build..." - fi - - - name: Set up Docker Buildx - if: steps.check.outputs.changed == 'true' - uses: docker/setup-buildx-action@v1 - - - name: Login to Docker Hub - if: steps.check.outputs.changed == 'true' - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_DEVBOT_USER }} - password: ${{ secrets.DOCKERHUB_DEVBOT_PWD }} - - - name: Build and Push Docker Image - if: steps.check.outputs.changed == 'true' - uses: docker/build-push-action@v2 - with: - context: src/options/generate/static_files/base_image - push: true - tags: jinaai/gpt-dev:${{ env.VERSION }} \ No newline at end of file diff --git a/src/constants.py b/src/constants.py index ef527c3..4ccd58e 100644 --- a/src/constants.py +++ b/src/constants.py @@ -1,4 +1,4 @@ -DOCKER_BASE_IMAGE_VERSION = '0.0.1' +DOCKER_BASE_IMAGE_VERSION = '0.0.2' EXECUTOR_FILE_NAME = '__init__.py' IMPLEMENTATION_FILE_NAME = 'microservice.py' diff --git a/src/options/generate/generator.py b/src/options/generate/generator.py index 5df2921..7af4515 100644 --- a/src/options/generate/generator.py +++ b/src/options/generate/generator.py @@ -17,7 +17,7 @@ from src.apis.pypi import is_package_on_pypi, get_latest_package_version, clean_ from src.constants import FILE_AND_TAG_PAIRS, NUM_IMPLEMENTATION_STRATEGIES, MAX_DEBUGGING_ITERATIONS, \ BLACKLISTED_PACKAGES, EXECUTOR_FILE_NAME, TEST_EXECUTOR_FILE_NAME, TEST_EXECUTOR_FILE_TAG, \ REQUIREMENTS_FILE_NAME, REQUIREMENTS_FILE_TAG, DOCKER_FILE_NAME, IMPLEMENTATION_FILE_NAME, \ - IMPLEMENTATION_FILE_TAG, LANGUAGE_PACKAGES, UNNECESSARY_PACKAGES + IMPLEMENTATION_FILE_TAG, LANGUAGE_PACKAGES, UNNECESSARY_PACKAGES, DOCKER_BASE_IMAGE_VERSION from src.options.generate.templates_system import system_task_iteration, system_task_introduction, system_test_iteration from src.options.generate.templates_user import template_generate_microservice_name, \ template_generate_possible_packages, \ @@ -211,7 +211,7 @@ metas: encoding='utf-8') as f: docker_file_template_lines = f.readlines() docker_file_template_lines = [ - line.replace('{{apt_get_packages}}', '') + line.replace('{{APT_GET_PACKAGES}}', '').replace('{{DOCKER_BASE_IMAGE_VERSION}}', DOCKER_BASE_IMAGE_VERSION) for line in docker_file_template_lines ] docker_file_content = '\n'.join(docker_file_template_lines) @@ -231,8 +231,8 @@ metas: packages = ' '.join(json.loads(json_string)['packages']) docker_file_template = self.read_docker_template() - return {DOCKER_FILE_NAME: docker_file_template.replace('{{apt_get_packages}}', '{apt_get_packages}').format( - apt_get_packages=packages)} + return {DOCKER_FILE_NAME: docker_file_template.replace('{{APT_GET_PACKAGES}}', '{APT_GET_PACKAGES}').replace('{{DOCKER_BASE_IMAGE_VERSION}}', DOCKER_BASE_IMAGE_VERSION).format( + APT_GET_PACKAGES=packages)} def parse_result_fn_requirements(self, content_raw: str): content_parsed = self.extract_content_from_result(content_raw, 'requirements.txt', match_single_block=True) diff --git a/src/options/generate/static_files/microservice/Dockerfile b/src/options/generate/static_files/microservice/Dockerfile index 5d4e97e..176f5f6 100644 --- a/src/options/generate/static_files/microservice/Dockerfile +++ b/src/options/generate/static_files/microservice/Dockerfile @@ -1,8 +1,6 @@ -FROM jinaai/gpt-dev:latest -# update pip -RUN pip install --upgrade pip +FROM jinaai/gpt-dev:{{DOCKER_BASE_IMAGE_VERSION}} -RUN apt-get install --no-install-recommends -y {{apt_get_packages}} +RUN apt-get install --no-install-recommends -y {{APT_GET_PACKAGES}} ## install requirements for the executor COPY requirements.txt . diff --git a/src/options/generate/templates_user.py b/src/options/generate/templates_user.py index 12f34e7..d4be807 100644 --- a/src/options/generate/templates_user.py +++ b/src/options/generate/templates_user.py @@ -170,7 +170,7 @@ template_generate_apt_get_install = PromptTemplate.from_template( {docker_file_wrapped} -Name all packages which need to be installed via `apt-get install` in above Dockerfile (`{{apt_get_packages}}`) for the following requirements.txt file: +Name all packages which need to be installed via `apt-get install` in above Dockerfile (`{{APT_GET_PACKAGES}}`) for the following requirements.txt file: {requirements_file_wrapped} @@ -178,7 +178,7 @@ Note that you must not list apt-get packages that are already installed in the D Note that openai does not require any apt-get packages. Note that you are only allowed to list packages where you are highly confident that they are really needed. Note that you can assume that the standard python packages are already installed. -Output the packages that need to me placed at {{apt_get_packages}} as json in the following format: +Output the packages that need to me placed at {{APT_GET_PACKAGES}} as json in the following format: **apt-get-packages.json** ```json {{"packages": ["", ""]}} @@ -275,7 +275,7 @@ Here is the summary of the error that occurred: {summarized_error} To solve this error, you should determine the list of packages that need to be installed via `apt-get install` in the Dockerfile. -Output the apt-get packages that need to be placed at {{apt_get_packages}} as json in the following format: +Output the apt-get packages that need to be placed at {{APT_GET_PACKAGES}} as json in the following format: **apt-get-packages.json** ```json {{"packages": ["", ""]}} From 41002443a1379736387ea7f4ae97ca81f986a9da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Ho=CC=88nicke?= Date: Thu, 4 May 2023 11:23:16 +0200 Subject: [PATCH 09/13] =?UTF-8?q?=F0=9F=90=8B=20feat:=20docker=20base=20im?= =?UTF-8?q?age?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 621d825..e7749a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,7 @@ name: CI on: workflow_dispatch: -# pull_request: + pull_request: jobs: test_cognitive_level: From 517793dde4ba3d9ccf3ab2bf04b6c1db06ad31df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Ho=CC=88nicke?= Date: Thu, 4 May 2023 11:24:54 +0200 Subject: [PATCH 10/13] =?UTF-8?q?=F0=9F=90=8B=20feat:=20docker=20base=20im?= =?UTF-8?q?age?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e7749a3..ec2ce7d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,7 @@ jobs: SCENEX_API_KEY: ${{ secrets.SCENEX_API_KEY }} WHISPER_API_KEY: ${{ secrets.WHISPER_API_KEY }} - build-and-push: + base-image-push: runs-on: ubuntu-latest steps: - name: Checkout Repository From e28ee71e03513b099778e3eb54dcedcd0020c460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Ho=CC=88nicke?= Date: Thu, 4 May 2023 11:26:08 +0200 Subject: [PATCH 11/13] =?UTF-8?q?=F0=9F=90=8B=20feat:=20docker=20base=20im?= =?UTF-8?q?age?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/constants.py b/src/constants.py index 4ccd58e..f2ac232 100644 --- a/src/constants.py +++ b/src/constants.py @@ -1,4 +1,4 @@ -DOCKER_BASE_IMAGE_VERSION = '0.0.2' +DOCKER_BASE_IMAGE_VERSION = '0.0.3' EXECUTOR_FILE_NAME = '__init__.py' IMPLEMENTATION_FILE_NAME = 'microservice.py' From 6a67882e048d050167efce78a2cad4301760a9a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Ho=CC=88nicke?= Date: Thu, 4 May 2023 15:51:39 +0200 Subject: [PATCH 12/13] =?UTF-8?q?=F0=9F=90=8B=20feat=20docker=20base=20ima?= =?UTF-8?q?ge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/options/generate/static_files/base_image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/options/generate/static_files/base_image/Dockerfile b/src/options/generate/static_files/base_image/Dockerfile index 33924d6..edd0c73 100644 --- a/src/options/generate/static_files/base_image/Dockerfile +++ b/src/options/generate/static_files/base_image/Dockerfile @@ -1,4 +1,4 @@ -FROM jinaai/jina:3.14.1-py39-standard +FROM jinaai/jina:3.15.1-dev14-py39-standard # update pip RUN pip install --upgrade pip From 5a1f7ed144e0fc30aa4089bfbc11913247af3b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Ho=CC=88nicke?= Date: Thu, 4 May 2023 15:53:38 +0200 Subject: [PATCH 13/13] =?UTF-8?q?=F0=9F=90=8B=20feat=20docker=20base=20ima?= =?UTF-8?q?ge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/constants.py b/src/constants.py index f2ac232..7b7f6d0 100644 --- a/src/constants.py +++ b/src/constants.py @@ -1,4 +1,4 @@ -DOCKER_BASE_IMAGE_VERSION = '0.0.3' +DOCKER_BASE_IMAGE_VERSION = '0.0.4' EXECUTOR_FILE_NAME = '__init__.py' IMPLEMENTATION_FILE_NAME = 'microservice.py'