Skip to content

Commit 2ac1bb4

Browse files
fix quickstart image
1 parent 73d6576 commit 2ac1bb4

File tree

5 files changed

+29
-12
lines changed

5 files changed

+29
-12
lines changed

Diff for: projects/vdk-core/cicd/Dockerfile-vdk-base

+13-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,22 @@ FROM $vdk_base_python_image
77

88
WORKDIR /vdk
99

10-
ENV VDK_VERSION $vdk_version
10+
ENV VDK_VERSION $vdk_versiongit
1111

1212
# Install VDK
1313
ARG vdk_version
1414
ARG vdk_package
1515
ARG pip_extra_index_url
1616
RUN pip install --extra-index-url $pip_extra_index_url $vdk_package==$vdk_version
17+
18+
# Install bash
19+
RUN apt-get update && apt-get install -y bash && echo "Bash installed successfully" || echo "Bash installation failed"
20+
21+
# Set default shell to bash
22+
SHELL ["/bin/bash", "-c"]
23+
24+
# Default command
25+
CMD ["/bin/bash"]
26+
27+
# Force a snapshot with a no-op RUN command
28+
RUN echo "Forcing snapshot"

Diff for: projects/vdk-core/cicd/deploy-base-vdk-image.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,12 @@ echo "{\"auths\":{\"$VDK_DOCKER_REGISTRY_URL\":{\"username\":\"$VDK_DOCKER_REGIS
4141

4242
SCRIPT_DIR=$(dirname "$0")
4343
DOCKERFILE_PATH="$SCRIPT_DIR/Dockerfile-vdk-base"
44-
/kaniko/executor --force --single-snapshot \
44+
/kaniko/executor --force \
4545
--dockerfile="${DOCKERFILE_PATH}" \
4646
--destination="${DOCKER_REGISTRY_IMAGE}:${VDK_VERSION}" \
4747
--destination="${DOCKER_REGISTRY_IMAGE}:${BUILD_TYPE}" \
4848
--build-arg=vdk_package="${VDK_PACKAGE}" \
4949
--build-arg=vdk_version="${VDK_VERSION}" \
5050
--build-arg=pip_extra_index_url="${PIP_EXTRA_INDEX_URL}" \
51-
--build-arg=vdk_base_python_image="${VDK_BASE_PYTHON_IMAGE}"
51+
--build-arg=vdk_base_python_image="${VDK_BASE_PYTHON_IMAGE}" \
52+
--cache=false

Diff for: projects/vdk-core/src/vdk/api/plugin/plugin_input.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def set_properties_factory_method(
6868
"""
6969
Register properties implementation backend.
7070
Properties API enable keeping state of a data job.
71-
Default implementation is in-memory so it's strongly recommended to install vdk-properties plugin
71+
Default implementation is in-memory, so it's strongly recommended to install vdk-properties plugin
7272
which provides API based properties implementation
7373
7474
IPropertiesServiceClient is used as provides logic of how properties are persisted

Diff for: projects/vdk-plugins/.plugin-common.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
retry: !reference [.retry, retry_options]
2222
rules: # we want to trigger build jobs if there are changes to this plugin,
2323
# but not if there are changes to other plugins or the main directory
24-
- if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "external_pull_request_event"'
24+
- if: '$CI_COMMIT_BRANCH == "main"'
2525
changes:
2626
- "projects/vdk-plugins/$PLUGIN_NAME/**/*"
2727
artifacts:
@@ -38,7 +38,7 @@
3838
USE_VDKCORE_DEV_VERSION: "yes"
3939
extends: .build-plugin-dind
4040
rules:
41-
- if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "external_pull_request_event"'
41+
- if: '$CI_COMMIT_BRANCH == "main"'
4242
changes:
4343
- "projects/vdk-core/*"
4444
- "projects/vdk-core/src/**/*"
@@ -74,6 +74,7 @@
7474
- if: '$CI_COMMIT_BRANCH == "main"'
7575
changes:
7676
- "projects/vdk-plugins/$PLUGIN_NAME/**/*"
77+
# - if: '$CI_PIPELINE_SOURCE == "external_pull_request_event"'
7778

7879

7980
.release-vdk-image:
@@ -102,3 +103,4 @@
102103
- if: '$CI_COMMIT_BRANCH == "main"'
103104
changes:
104105
- "projects/vdk-plugins/$PLUGIN_NAME/**/*"
106+
# - if: '$CI_PIPELINE_SOURCE == "external_pull_request_event"'

Diff for: projects/vdk-plugins/quickstart-vdk/.plugin-ci.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,18 @@ release-quickstart-vdk:
8787
variables:
8888
PLUGIN_NAME: quickstart-vdk
8989
rules:
90-
- if: '$CI_COMMIT_BRANCH == "main"'
91-
changes: *test_quickstart_vdk_locations
90+
# - if: '$CI_COMMIT_BRANCH == "main"'
91+
# changes: *test_quickstart_vdk_locations
92+
- if: '$CI_PIPELINE_SOURCE == "external_pull_request_event"'
9293
extends: .release-plugin
9394

9495
release-vdk-image-quickstart-vdk:
9596
variables:
9697
PLUGIN_NAME: quickstart-vdk
9798
extends: .release-vdk-image
9899
rules:
99-
- if: '$CI_COMMIT_BRANCH == "main"'
100-
changes: *test_quickstart_vdk_locations
101-
- if: '$CI_PIPELINE_SOURCE == "schedule"'
102-
when: never
100+
# - if: '$CI_COMMIT_BRANCH == "main"'
101+
# changes: *test_quickstart_vdk_locations
102+
# - if: '$CI_PIPELINE_SOURCE == "schedule"'
103+
# when: never
104+
- if: '$CI_PIPELINE_SOURCE == "external_pull_request_event"'

0 commit comments

Comments
 (0)