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
GitLab 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
9d2ab492
Verified
Commit
9d2ab492
authored
1 year ago
by
Martin Weise
Browse files
Options
Downloads
Patches
Plain Diff
Trivy needs different MTU
parent
4791948c
No related branches found
No related tags found
2 merge requests
!235
Master
,
!233
Master
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+5
-3
5 additions, 3 deletions
.gitlab-ci.yml
Makefile
+0
-7
0 additions, 7 deletions
Makefile
with
5 additions
and
10 deletions
.gitlab-ci.yml
+
5
−
3
View file @
9d2ab492
...
@@ -245,6 +245,7 @@ scan-metadata-service:
...
@@ -245,6 +245,7 @@ scan-metadata-service:
-
master
-
master
allow_failure
:
true
allow_failure
:
true
script
:
script
:
-
"
ifconfig
eth0
mtu
1450
up"
-
trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-metadata-service-report.json docker.io/dbrepo/metadata-service:latest
-
trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-metadata-service-report.json docker.io/dbrepo/metadata-service:latest
-
trivy image --insecure --exit-code 0 docker.io/dbrepo/metadata-service:latest
-
trivy image --insecure --exit-code 0 docker.io/dbrepo/metadata-service:latest
-
trivy image --insecure --exit-code 1 --severity CRITICAL docker.io/dbrepo/metadata-service:latest
-
trivy image --insecure --exit-code 1 --severity CRITICAL docker.io/dbrepo/metadata-service:latest
...
@@ -266,6 +267,7 @@ scan-data-service:
...
@@ -266,6 +267,7 @@ scan-data-service:
-
master
-
master
allow_failure
:
true
allow_failure
:
true
script
:
script
:
-
"
ifconfig
eth0
mtu
1450
up"
-
trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-data-service-report.json docker.io/dbrepo/data-service:latest
-
trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-data-service-report.json docker.io/dbrepo/data-service:latest
-
trivy image --insecure --exit-code 0 docker.io/dbrepo/data-service:latest
-
trivy image --insecure --exit-code 0 docker.io/dbrepo/data-service:latest
-
trivy image --insecure --exit-code 1 --severity CRITICAL docker.io/dbrepo/data-service:latest
-
trivy image --insecure --exit-code 1 --severity CRITICAL docker.io/dbrepo/data-service:latest
...
@@ -514,10 +516,10 @@ release-helm-latest:
...
@@ -514,10 +516,10 @@ release-helm-latest:
-
echo "$CI_REGISTRY2_PASSWORD" | docker login --username "$CI_REGISTRY2_USER" --password-stdin $CI_REGISTRY2_URL
-
echo "$CI_REGISTRY2_PASSWORD" | docker login --username "$CI_REGISTRY2_USER" --password-stdin $CI_REGISTRY2_URL
script
:
script
:
-
apk add sed helm
-
apk add sed helm
-
'
sed
-i
-e
"s/^version:.*/version:
\"${CHART_VERSION}-
RC1
\"/g"
./helm-charts/dbrepo/Chart.yaml'
-
'
sed
-i
-e
"s/^version:.*/version:
\"${CHART_VERSION}-
0.git.${CI_PIPELINE_ID}.${CI_COMMIT_SHORT_SHA}
\"/g"
./helm-charts/dbrepo/Chart.yaml'
-
'
sed
-i
-e
"s/^appVersion:.*/appVersion:
\"
latest
\"/g"
./helm-charts/dbrepo/Chart.yaml'
-
'
sed
-i
-e
"s/^appVersion:.*/appVersion:
\"
${CHART_VERSION}-0.git.${CI_PIPELINE_ID}.${CI_COMMIT_SHORT_SHA}
\"/g"
./helm-charts/dbrepo/Chart.yaml'
-
helm package ./helm-charts/dbrepo --destination ./build
-
helm package ./helm-charts/dbrepo --destination ./build
-
helm push "./build/dbrepo-${CHART_VERSION}-
RC1
.tgz" "oci://${CI_REGISTRY2_URL}/helm"
-
helm push "./build/dbrepo-${CHART_VERSION}-
0.git.${CI_PIPELINE_ID}.${CI_COMMIT_SHORT_SHA}
.tgz" "oci://${CI_REGISTRY2_URL}/helm"
release-helm-1.4
:
release-helm-1.4
:
stage
:
release
stage
:
release
...
...
This diff is collapsed.
Click to expand it.
Makefile
+
0
−
7
View file @
9d2ab492
...
@@ -36,9 +36,6 @@ build-frontend:
...
@@ -36,9 +36,6 @@ build-frontend:
build-swagger
:
build-swagger
:
bash ./.docs/generate.sh
bash ./.docs/generate.sh
build-helm-chart
:
helm package ./helm-charts/dbrepo
--destination
./build
tag
:
tag-analyse-service tag-authentication-service tag-metadata-db tag-ui tag-metadata-service tag-data-service tag-search-db tag-search-db-init tag-search-service tag-data-db-sidecar
tag
:
tag-analyse-service tag-authentication-service tag-metadata-db tag-ui tag-metadata-service tag-data-service tag-search-db tag-search-db-init tag-search-service tag-data-db-sidecar
tag-analyse-service
:
tag-analyse-service
:
...
@@ -131,10 +128,6 @@ release-storage-service-init: tag-storage-service-init
...
@@ -131,10 +128,6 @@ release-storage-service-init: tag-storage-service-init
docker push
"
${
REPOSITORY_1_URL
}
/storage-service-init:
${
TAG
}
"
docker push
"
${
REPOSITORY_1_URL
}
/storage-service-init:
${
TAG
}
"
docker push
"
${
REPOSITORY_2_URL
}
/storage-service-init:
${
TAG
}
"
docker push
"
${
REPOSITORY_2_URL
}
/storage-service-init:
${
TAG
}
"
release-helm-chart
:
build-helm-chart
helm package ./helm-charts/dbrepo
--destination
./build
helm push ./build/dbrepo-
${
TAG
}
-dev
.tgz
"oci://
${
REPOSITORY_2_URL
}
/helm"
test-backend
:
test-metadata-service test-analyse-service test-data-service
test-backend
:
test-metadata-service test-analyse-service test-data-service
test-data-service
:
build-data-service
test-data-service
:
build-data-service
...
...
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