Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
5cea825bc0
|
|||
|
bd2748e25c
|
|||
|
0f1093774f
|
|||
|
d19b7f5563
|
@@ -1,4 +1,6 @@
|
|||||||
delta-force-guide-server.iml
|
delta-force-guide-server.iml
|
||||||
build/
|
build/
|
||||||
|
!.gitlab-ci.yml
|
||||||
|
!build/libs/*.jar
|
||||||
.idea/
|
.idea/
|
||||||
.gradle
|
.gradle
|
||||||
+7
-12
@@ -1,6 +1,4 @@
|
|||||||
variables:
|
variables:
|
||||||
REGISTRY: registry.onixbyte.cn
|
|
||||||
IMAGE_NAME: delta-force-guide
|
|
||||||
GRADLE_OPTS: -Dorg.gradle.daemon=false
|
GRADLE_OPTS: -Dorg.gradle.daemon=false
|
||||||
DOCKER_HOST: unix:///var/run/docker.sock
|
DOCKER_HOST: unix:///var/run/docker.sock
|
||||||
|
|
||||||
@@ -21,10 +19,6 @@ build:
|
|||||||
- chmod +x gradlew
|
- chmod +x gradlew
|
||||||
script:
|
script:
|
||||||
- ./gradlew bootJar -x test -PartefactVersion="$CI_COMMIT_TAG"
|
- ./gradlew bootJar -x test -PartefactVersion="$CI_COMMIT_TAG"
|
||||||
artifacts:
|
|
||||||
paths:
|
|
||||||
- build/libs/*.jar
|
|
||||||
expire_in: 30 min
|
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_COMMIT_TAG
|
- if: $CI_COMMIT_TAG
|
||||||
|
|
||||||
@@ -37,11 +31,12 @@ package:
|
|||||||
- JAR_FILE=$(find build/libs -name '*.jar' | head -1)
|
- JAR_FILE=$(find build/libs -name '*.jar' | head -1)
|
||||||
- echo "Building Docker image for tag $CI_COMMIT_TAG with JAR $JAR_FILE"
|
- echo "Building Docker image for tag $CI_COMMIT_TAG with JAR $JAR_FILE"
|
||||||
- docker build
|
- docker build
|
||||||
|
--provenance=false
|
||||||
-f Dockerfile.ci
|
-f Dockerfile.ci
|
||||||
--build-arg JAR_FILE="$JAR_FILE"
|
--build-arg JAR_FILE="$JAR_FILE"
|
||||||
-t "$REGISTRY/$IMAGE_NAME:$CI_COMMIT_TAG"
|
-t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
|
||||||
.
|
.
|
||||||
- docker tag "$REGISTRY/$IMAGE_NAME:$CI_COMMIT_TAG" "$REGISTRY/$IMAGE_NAME:latest"
|
- docker tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" "$CI_REGISTRY_IMAGE:latest"
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_COMMIT_TAG
|
- if: $CI_COMMIT_TAG
|
||||||
|
|
||||||
@@ -51,9 +46,9 @@ deploy:
|
|||||||
needs:
|
needs:
|
||||||
- package
|
- package
|
||||||
script:
|
script:
|
||||||
- echo "Pushing image $REGISTRY/$IMAGE_NAME:$CI_COMMIT_TAG"
|
- echo "Pushing image $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
|
||||||
- docker login "$REGISTRY" -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
|
- docker login "$CI_REGISTRY" -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
|
||||||
- docker push "$REGISTRY/$IMAGE_NAME:$CI_COMMIT_TAG"
|
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
|
||||||
- docker push "$REGISTRY/$IMAGE_NAME:latest"
|
- docker push "$CI_REGISTRY_IMAGE:latest"
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_COMMIT_TAG
|
- if: $CI_COMMIT_TAG
|
||||||
|
|||||||
Reference in New Issue
Block a user