Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
hivemind
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hive
hivemind
Commits
3feb6b03
Commit
3feb6b03
authored
10 months ago
by
Konrad Botor
Committed by
Michał Kudela
6 months ago
Browse files
Options
Downloads
Patches
Plain Diff
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
!827
Merge develop changes to master
,
!717
Rewrite python function to sql ( condenser_api )
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yaml
+2
-2
2 additions, 2 deletions
.gitlab-ci.yaml
Dockerfile
+2
-1
2 additions, 1 deletion
Dockerfile
scripts/ci/build_ci_base_image.sh
+2
-2
2 additions, 2 deletions
scripts/ci/build_ci_base_image.sh
with
6 additions
and
5 deletions
.gitlab-ci.yaml
+
2
−
2
View file @
3feb6b03
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
2
−
1
View file @
3feb6b03
...
@@ -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 .
...
...
This diff is collapsed.
Click to expand it.
scripts/ci/build_ci_base_image.sh
+
2
−
2
View file @
3feb6b03
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment