Merge pull request #4 from a645162/dev

feat(CI/CD): Support version Tags

.github/workflows/docker-publish.yml

@@ -25,6 +25,8 @@ jobs:
         run: |
           python --version
           pip --version
+          python version.py
+          echo "PROGRAM_VERSION=${python version.py}" >> $GITHUB_ENV
 
       - name: Build .jar file
         run: python build_with_docker.py
@@ -83,7 +85,9 @@ jobs:
           push: true
           tags: |
             ${{ github.repository }}:${{ env.IMAGE_TAG }},
+            ${{ github.repository }}:${{ env.PROGRAM_VERSION }},
             ${{ env.ACR_REGISTRY }}/${{ github.repository }}:${{ env.IMAGE_TAG }},
+            ${{ env.ACR_REGISTRY }}/${{ github.repository }}:${{ env.PROGRAM_VERSION }},
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}

.run/act.docker.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="act.docker" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
+  <configuration default="false" name="act.docker" type="PythonConfigurationType" factoryName="Python" folderName="Dev" nameIsGenerated="true">
     <module name="group-center" />
     <option name="ENV_FILES" value="" />
     <option name="INTERPRETER_OPTIONS" value="" />

.run/version.run.xml

@@ -0,0 +1,25 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="version" type="PythonConfigurationType" factoryName="Python" folderName="Dev" nameIsGenerated="true">
+    <module name="group-center" />
+    <option name="ENV_FILES" value="" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/version.py" />
+    <option name="PARAMETERS" value="" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

build.gradle.kts

@@ -25,7 +25,7 @@ val springBootVersion = "3.3.3"
 val myBatisVersion = "3.0.3"
 
 group = "com.khm.group"
-version = "1.0.1-SNAPSHOT"
+version = "1.0.2-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

docker-compose.yml

@@ -1,9 +1,11 @@
 services:
   group_center:
-    image: group_center
-    build:
-      context: .
-      dockerfile: Dockerfile
+    image: registry.cn-shanghai.aliyuncs.com/a645162/group-center:latest
+    #    image: a645162/group-center:latest
+    #    image: group_center
+    #    build:
+    #      context: .
+    #      dockerfile: Dockerfile
     ports:
       - 15090:15090
       - 15092:15092

src/main/resources/settings/version.properties

@@ -1 +1 @@
-version=1.0.1-SNAPSHOT
+version=1.0.2-SNAPSHOT

version.py

@@ -0,0 +1,19 @@
+def get_version():
+    relative_path = "./src/main/resources/settings/version.properties"
+    version = "0.0.0"
+
+    with open(relative_path, "r") as f:
+        lines = f.readlines()
+        for this_line in lines:
+            line = this_line
+            line = line.strip()
+            if line.startswith("version="):
+                version = line.replace("version=", "").strip()
+
+    version = version.replace("-SNAPSHOT", "")
+
+    return version.strip()
+
+
+if __name__ == "__main__":
+    print(get_version(), end="")