Skip to content
Snippets Groups Projects
Commit 3feb6b03 authored by Konrad Botor's avatar Konrad Botor Committed by Michał Kudela
Browse files

Moved PostgREST installation step from instance to runtime to make it available in CI

parent 80447b5c
No related branches found
No related tags found
2 merge requests!827Merge develop changes to master,!717Rewrite python function to sql ( condenser_api )
...@@ -321,7 +321,7 @@ cleanup_haf_cache_manual: ...@@ -321,7 +321,7 @@ cleanup_haf_cache_manual:
download_await: download_await:
extends: .job-defaults extends: .job-defaults
image: $CI_REGISTRY_IMAGE/ci-base-image:python-3.8-slim-4 image: $CI_REGISTRY_IMAGE/ci-base-image:python-3.8-slim-5
stage: prepare stage: prepare
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
...@@ -412,7 +412,7 @@ sync: ...@@ -412,7 +412,7 @@ sync:
- data-cache-storage - data-cache-storage
e2e_benchmark: e2e_benchmark:
image: $CI_REGISTRY_IMAGE/ci-base-image:python-3.8-slim-4 image: $CI_REGISTRY_IMAGE/ci-base-image:python-3.8-slim-5
stage: benchmark stage: benchmark
interruptible: true interruptible: true
needs: needs:
......
...@@ -39,6 +39,8 @@ RUN <<EOF ...@@ -39,6 +39,8 @@ RUN <<EOF
useradd -ms /bin/bash -c "Hivemind service account" -u 1000 "hivemind" --groups users useradd -ms /bin/bash -c "Hivemind service account" -u 1000 "hivemind" --groups users
EOF EOF
COPY --chmod=755 --from=pure_postgrest /bin/postgrest /usr/local/bin
SHELL ["/bin/bash", "-c"] SHELL ["/bin/bash", "-c"]
FROM runtime AS ci-base-image FROM runtime AS ci-base-image
...@@ -120,7 +122,6 @@ WORKDIR /home/hivemind ...@@ -120,7 +122,6 @@ WORKDIR /home/hivemind
SHELL ["/bin/bash", "-c"] SHELL ["/bin/bash", "-c"]
COPY --chmod=755 --from=pure_postgrest /bin/postgrest /usr/local/bin
COPY --from=builder --chown=hivemind:hivemind /home/hivemind/app/dist /home/hivemind/dist COPY --from=builder --chown=hivemind:hivemind /home/hivemind/app/dist /home/hivemind/dist
COPY --from=builder --chown=hivemind:hivemind /home/hivemind/.hivemind-venv /home/hivemind/.hivemind-venv COPY --from=builder --chown=hivemind:hivemind /home/hivemind/.hivemind-venv /home/hivemind/.hivemind-venv
COPY --from=builder --chown=hivemind:hivemind /home/hivemind/app/docker/docker_entrypoint.sh . COPY --from=builder --chown=hivemind:hivemind /home/hivemind/app/docker/docker_entrypoint.sh .
......
...@@ -10,7 +10,7 @@ cat <<EOF ...@@ -10,7 +10,7 @@ cat <<EOF
Options: Options:
--registry=URL Registry to use as a part of image names (default: registry.gitlab.syncad.com/hive/hivemind) --registry=URL Registry to use as a part of image names (default: registry.gitlab.syncad.com/hive/hivemind)
--tag=TAG Image tag (default: python-3.8-slim-4) --tag=TAG Image tag (default: python-3.8-slim-5)
EOF EOF
} }
...@@ -21,7 +21,7 @@ function image-exists() { ...@@ -21,7 +21,7 @@ function image-exists() {
} }
REGISTRY=${REGISTRY:-"registry.gitlab.syncad.com/hive/hivemind"} REGISTRY=${REGISTRY:-"registry.gitlab.syncad.com/hive/hivemind"}
CI_IMAGE_TAG=${CI_IMAGE_TAG:-"python-3.8-slim-4"} CI_IMAGE_TAG=${CI_IMAGE_TAG:-"python-3.8-slim-5"}
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case "$1" in case "$1" in
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment