mirror of
https://gitlab.com/mangadex-pub/mangadex_at_home.git
synced 2024-01-19 02:48:37 +00:00
Fix a few more nits with CI
This commit is contained in:
parent
15f13eb7c3
commit
0a7e738253
|
@ -49,11 +49,13 @@ Docker Build:
|
|||
stage: docker
|
||||
needs:
|
||||
- Gradle Build
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
|
||||
before_script:
|
||||
- echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY}
|
||||
- export VERSION="${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}"
|
||||
- export BASE_TAG="$CI_COMMIT_SHORT_SHA"
|
||||
- export BASE_TAG="git-$CI_COMMIT_SHORT_SHA"
|
||||
|
||||
script:
|
||||
- mv build/libs/mangadex_at_home-${VERSION}-all.jar build/libs/mangadex_at_home.jar
|
||||
|
@ -70,7 +72,7 @@ Docker Build:
|
|||
|
||||
before_script:
|
||||
- echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY}
|
||||
- export BASE_TAG="$CI_COMMIT_SHORT_SHA"
|
||||
- export BASE_TAG="git-$CI_COMMIT_SHORT_SHA"
|
||||
|
||||
script:
|
||||
- docker pull $CI_REGISTRY_IMAGE:$BASE_TAG
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM adoptopenjdk:15
|
||||
FROM adoptopenjdk:17
|
||||
|
||||
WORKDIR /mangahome
|
||||
ADD /build/libs/mangadex_at_home.jar /mangahome/mangadex_at_home.jar
|
||||
|
|
Loading…
Reference in a new issue