gitlab-com-mangadex-pub/mangadex_at_home
1
0
Fork 1
mirror of https://gitlab.com/mangadex-pub/mangadex_at_home.git synced 2024-01-19 02:48:37 +00:00
Code Releases Activity

Merge branch 'modernize-ci-again' into 'master'

Browse source 
Fix a few more nits with CI

See merge request mangadex-pub/mangadex_at_home!96
This commit is contained in:
carbotaniuman 2021-10-19 01:24:53 +00:00
parent 15f13eb7c3 0a7e738253
commit 0d490b3d5b
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.yml
View file

@ -49,11 +49,13 @@ Docker Build:
stage: docker stage: docker
needs: needs:
- Gradle Build - Gradle Build
variables:
GIT_STRATEGY: none
before_script: before_script:
- echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY} - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY}
- export VERSION="${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}" - 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: script:
- mv build/libs/mangadex_at_home-${VERSION}-all.jar build/libs/mangadex_at_home.jar - mv build/libs/mangadex_at_home-${VERSION}-all.jar build/libs/mangadex_at_home.jar
@ -70,7 +72,7 @@ Docker Build:
before_script: before_script:
- echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY} - 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: script:
- docker pull $CI_REGISTRY_IMAGE:$BASE_TAG - docker pull $CI_REGISTRY_IMAGE:$BASE_TAG

2
Dockerfile
View file

@ -1,4 +1,4 @@
FROM adoptopenjdk:15 FROM adoptopenjdk:17
WORKDIR /mangahome WORKDIR /mangahome
ADD /build/libs/mangadex_at_home.jar /mangahome/mangadex_at_home.jar ADD /build/libs/mangadex_at_home.jar /mangahome/mangadex_at_home.jar