Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
DBRepo
Manage
Activity
Members
Labels
Plan
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FAIR Data Austria DB Repository
DBRepo
Commits
4085cfa2
Verified
Commit
4085cfa2
authored
1 year ago
by
Martin Weise
Browse files
Options
Downloads
Patches
Plain Diff
Attempt kaniko #azure
parent
297bcb2c
No related branches found
No related tags found
4 merge requests
!231
CI: Remove build for log-service
,
!228
Better error message handling in the frontend
,
!223
Release of version 1.4.0
,
!190
Resolve "More env variables for Azure deployment"
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+15
-10
15 additions, 10 deletions
.gitlab-ci.yml
Dockerfile
+7
-0
7 additions, 0 deletions
Dockerfile
dbrepo-metadata-db/Dockerfile
+0
-6
0 additions, 6 deletions
dbrepo-metadata-db/Dockerfile
docker-compose.yml
+2
-3
2 additions, 3 deletions
docker-compose.yml
with
24 additions
and
19 deletions
.gitlab-ci.yml
+
15
−
10
View file @
4085cfa2
variables
:
#
DOCKER_HOST: "${DOCKER_PORT}"
#
DOCKER_TLS_CERTDIR: ""
#
DOCKER_TLS_VERIFY: 0
DOCKER_HOST
:
"
${DOCKER_PORT}"
DOCKER_TLS_CERTDIR
:
"
"
DOCKER_TLS_VERIFY
:
0
TAG
:
"
${TAG:-latest}"
TRIVY_NO_PROGRESS
:
"
true"
TRIVY_CACHE_DIR
:
"
.trivycache/"
...
...
@@ -31,7 +31,7 @@ build-analyse-service:
image
:
python:3.9-slim
stage
:
build-backend
script
:
-
"
pip
3
install
-r
./dbrepo-analyse-service/requirements.txt"
-
"
pip
install
-r
./dbrepo-analyse-service/requirements.txt"
build-search-sync-agent
:
image
:
maven:3-openjdk-17
...
...
@@ -48,16 +48,21 @@ build-frontend:
-
"
yarn
--cwd
./dbrepo-ui
run
build"
build-docker
:
image
:
docker:24-dind
image
:
name
:
gcr.io/kaniko-project/executor:v1.15.0-debug
entrypoint
:
[
"
"
]
stage
:
build-docker
needs
:
-
build-metadata-service
-
build-analyse-service
script
:
-
cp .env.unix.example .env
-
"
docker
build
-t
dbrepo-metadata-service:build
--target
build
dbrepo-metadata-service"
-
"
docker
build
-t
dbrepo-search-sync-agent:build
--target
build
dbrepo-search-sync-agent"
-
"
docker
compose
build
--parallel"
-
/kaniko/executor --context ./dbrepo-analyse-service --dockerfile "./dbrepo-analyse-service/Dockerfile" --no-push
-
/kaniko/executor --context ./dbrepo-authentication-service --dockerfile "./dbrepo-authentication-service/Dockerfile" --no-push
-
/kaniko/executor --context ./dbrepo-broker-service --dockerfile "./dbrepo-broker-service/Dockerfile" --no-push
-
/kaniko/executor --context ./dbrepo-metadata-db --dockerfile "./dbrepo-metadata-db/Dockerfile" --no-push
-
/kaniko/executor --context ./dbrepo-metadata-service --dockerfile "./dbrepo-metadata-service/Dockerfile" --no-push
-
/kaniko/executor --context ./dbrepo-search-sync-agent --dockerfile "./dbrepo-search-sync-agent/Dockerfile" --no-push
-
/kaniko/executor --context ./dbrepo-ui --dockerfile "./dbrepo-ui/Dockerfile" --no-push
test-metadata-service
:
stage
:
test-backend
...
...
@@ -99,7 +104,7 @@ test-analyse-service:
needs
:
-
build-analyse-service
script
:
-
"
pip
3
install
-r
./dbrepo-analyse-service/requirements.txt"
-
"
pip
install
-r
./dbrepo-analyse-service/requirements.txt"
-
"
cd
./dbrepo-analyse-service/
&&
coverage
run
-m
pytest
test/test_determine_dt.py
test/test_determine_pk.py
--junitxml=report.xml
&&
coverage
html
&&
coverage
report
>
./coverage.txt"
-
"
cat
./dbrepo-analyse-service/coverage.txt
|
grep
-o
'TOTAL[^%]*%'"
artifacts
:
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
0 → 100644
+
7
−
0
View file @
4085cfa2
FROM
gcr.io/kaniko-project/executor:v1.15.0-debug
ENTRYPOINT
[""]
COPY
./dbrepo-metadata-service ./dbrepo-metadata-service
RUN
/kaniko/executor
--context
./dbrepo-metadata-service
--dockerfile
"./dbrepo-metadata-service/Dockerfile"
--no-push
\ No newline at end of file
This diff is collapsed.
Click to expand it.
dbrepo-metadata-db/Dockerfile
+
0
−
6
View file @
4085cfa2
...
...
@@ -6,10 +6,4 @@ ENV METADATA_PASSWORD=dbrepo
ENV
MARIADB_DATABASE="${METADATA_DB}"
ENV
MARIADB_ROOT_PASSWORD="${METADATA_PASSWORD}"
# force lower-case table names
COPY
./51-dbrepo.cnf /opt/bitnami/mariadb/conf/my_custom.cnf
# Scripts are copied to /docker-entrypoint-initdb.d/ in docker-compose from analyze service
HEALTHCHECK
--interval=10s --timeout=5s --retries=12 CMD mysqladmin ping --user="$METADATA_USERNAME" --password="$METADATA_PASSWORD" --silent
COPY
./setup-schema.sql /docker-entrypoint-initdb.d/setup-schema.sql
\ No newline at end of file
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
2
−
3
View file @
4085cfa2
...
...
@@ -33,8 +33,7 @@ services:
restart
:
"
no"
container_name
:
dbrepo-metadata-db
hostname
:
metadata-db
build
:
./dbrepo-metadata-db
image
:
dbrepo-metadata-db
image
:
bitnami/mariadb:10.5
networks
:
core
:
volumes
:
...
...
@@ -57,7 +56,7 @@ services:
restart
:
"
no"
container_name
:
dbrepo-data-db
hostname
:
data-db
image
:
mariadb:10.5
image
:
bitnami/
mariadb:10.5
networks
:
core
:
volumes
:
...
...
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