fix: use GitLab predefined environment variables for container registry

Replace custom registry variables with GitLab's predefined CI_REGISTRY, CI_REGISTRY_IMAGE, and CI_REGISTRY_USER to ensure the built-in CI_JOB_TOKEN has correct push permissions.
fix: allow jar files to be copied in Docker build context
2026-05-25 11:47:22 +08:00 · 2026-05-25 11:05:25 +08:00 · 2026-05-25 10:20:50 +08:00 · 2026-05-25 10:17:33 +08:00 · 2026-05-25 09:11:13 +08:00 · 2026-04-09 17:53:28 +08:00
2 changed files with 10 additions and 13 deletions
@@ -1,4 +1,6 @@
 delta-force-guide-server.iml
 build/
+!.gitlab-ci.yml
+!build/libs/*.jar
 .idea/
 .gradle
@@ -1,7 +1,6 @@
 variables:
-  REGISTRY: registry.onixbyte.cn
-  IMAGE_NAME: delta-force-guide
  GRADLE_OPTS: -Dorg.gradle.daemon=false
+  DOCKER_HOST: unix:///var/run/docker.sock

 stages:
  - build
@@ -19,7 +18,7 @@ build:
  before_script:
    - chmod +x gradlew
  script:
-    - ./gradlew bootJar -x test
+    - ./gradlew bootJar -x test -PartefactVersion="$CI_COMMIT_TAG"
  artifacts:
    paths:
      - build/libs/*.jar
@@ -30,8 +29,6 @@ build:
 package:
  stage: package
  image: docker:27
-  services:
-    - docker:27-dind
  needs:
    - build
  script:
@@ -40,23 +37,21 @@ package:
    - docker build
        -f Dockerfile.ci
        --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:
    - if: $CI_COMMIT_TAG

 deploy:
  stage: deploy
  image: docker:27
-  services:
-    - docker:27-dind
  needs:
    - package
  script:
-    - echo "Pushing image $REGISTRY/$IMAGE_NAME:$CI_COMMIT_TAG"
-    - docker login "$REGISTRY" -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
-    - docker push "$REGISTRY/$IMAGE_NAME:$CI_COMMIT_TAG"
-    - docker push "$REGISTRY/$IMAGE_NAME:latest"
+    - echo "Pushing image $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
+    - docker login "$CI_REGISTRY" -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
+    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
+    - docker push "$CI_REGISTRY_IMAGE:latest"
  rules:
    - if: $CI_COMMIT_TAG
Author	SHA1	Message	Date
siujamo	0f1093774f	fix: use GitLab predefined environment variables for container registry Replace custom registry variables with GitLab's predefined CI_REGISTRY, CI_REGISTRY_IMAGE, and CI_REGISTRY_USER to ensure the built-in CI_JOB_TOKEN has correct push permissions.	2026-05-25 11:47:22 +08:00
siujamo	d19b7f5563	fix: allow jar files to be copied in Docker build context Add '!build/libs/*.jar' to .dockerignore so that Docker build can access the build artifacts in the package stage.	2026-05-25 11:05:25 +08:00
siujamo	ea1456c5a5	Merge branch 'develop' into 'main' chore: switch CI to Docker socket binding and add artefact version parameter See merge request onixbyte/delta-force-guide-server!2	2026-05-25 10:20:50 +08:00
siujamo	b60cd36535	chore: switch CI to Docker socket binding and add artefact version parameter Replace DinD services with unix:///var/run/docker.sock socket binding to fix "Cannot connect to Docker daemon" errors. Add -PartefactVersion parameter to Gradle build for release version tracking.	2026-05-25 10:17:33 +08:00
siujamo	1115cd4527	Merge branch 'develop' into 'main' v1.3.0: Introduced Daily Password See merge request onixbyte/delta-force-guide-server!1	2026-05-25 09:11:13 +08:00
zihluwang	6e6843c412	Merge pull request #1 from zihluwang/develop Enhance Firearm model and add tag filtering to queries	2026-04-09 17:53:28 +08:00