Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
DARIAH-DE
TextGridRep Portal
Commits
eded5fe3
Commit
eded5fe3
authored
Sep 16, 2021
by
Ubbo Veentjer
Browse files
fix for java11, test jib
parent
9046c6c2
Pipeline
#229604
passed with stages
in 7 minutes and 31 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
eded5fe3
...
...
@@ -28,11 +28,12 @@ stages:
-
deploy
build
:
image
:
gradle:jdk8
stage
:
build
before_script
:
-
*docker-setup
script
:
# this runs on intergalactic because a docker daemon is accessible...?
-
gradle bootBuildImage --imageName=
$CONTAINER_TEST_IMAGE
-
docker build -t $CONTAINER_TEST_IMAGE .
-
docker push
$CONTAINER_TEST_IMAGE
test
:
...
...
@@ -71,7 +72,7 @@ tag-dev-image:
before_script
:
-
*docker-setup
script
:
#
- docker pull $CONTAINER_TEST_IMAGE
-
docker pull $CONTAINER_TEST_IMAGE
-
docker tag $CONTAINER_TEST_IMAGE $CONTAINER_TEST_IMAGE_LATEST
-
docker push $CONTAINER_TEST_IMAGE_LATEST
-
docker logout
...
...
Dockerfile
View file @
eded5fe3
FROM
gradle:jdk
8
as build
FROM
gradle:jdk
11
as build
COPY
. /build
WORKDIR
/build
RUN
gradle
--build-cache
assemble
RUN
pwd
RUN
ls
/build
RUN
ls
/build/build/libs/
FROM
gcr.io/distroless/java
:8
FROM
gcr.io/distroless/java
-debian10:11
#RUN addgroup -S tgrep && adduser -S tgrep -G tgrep
#USER tgrep:tgrep
COPY
--from=build /build/build/libs/portal.war portal.war
...
...
build.gradle
View file @
eded5fe3
...
...
@@ -6,8 +6,10 @@ plugins {
id
'jacoco'
id
'java'
id
'war'
id
'com.google.cloud.tools.jib'
version
'3.1.4'
}
group
=
'info.textgrid.rep'
version
=
'3.1.9-SNAPSHOT'
sourceCompatibility
=
'1.8'
...
...
@@ -22,6 +24,9 @@ bootWar {
jar = bootWar.archiveFile
}*/
jib
.
from
.
image
=
'gcr.io/distroless/java:8'
jib
.
container
.
entrypoint
=
'/libs/portal.war'
repositories
{
mavenCentral
()
maven
{
url
'https://nexus.gwdg.de/repository/maven-dariah-public'
}
...
...
@@ -44,6 +49,7 @@ dependencies {
implementation
'com.atlassian.commonmark:commonmark-ext-gfm-tables:0.14.0'
implementation
'com.atlassian.commonmark:commonmark-ext-yaml-front-matter:0.14.0'
implementation
'info.textgrid.middleware.clients:textgrid-clients:3.5.6-SNAPSHOT'
implementation
'jakarta.xml.ws:jakarta.xml.ws-api:2.3.3'
developmentOnly
(
"org.springframework.boot:spring-boot-devtools"
)
testImplementation
(
'org.springframework.boot:spring-boot-starter-test'
)
{
exclude
group:
'org.junit.vintage'
,
module:
'junit-vintage-engine'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment