feat: env

Author: aFcFzF

.github/workflows/deploy_redis.yml

@@ -18,12 +18,12 @@ jobs:
       - name: Set Bash Env
         run: |
           echo "GIT_HASH_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
-          echo "DOCKER_CONTAINER_NAME=server-demo-redis" >> $GITHUB_ENV
+          echo "DOCKER_CONTAINER_NAME=server-app-redis" >> $GITHUB_ENV
           # show output
           echo "output is ${{ env.GIT_HASH_SHORT }}"
 
       - name: Build the Docker image
-        run: docker build -t ${{ secrets.SWR_DOCKER_REDIS_PATH }}:"$GIT_HASH_SHORT" .
+        run: docker build --platform linux/x86_64 -t ${{ secrets.SWR_DOCKER_REDIS_PATH }}:"$GIT_HASH_SHORT" .
 
       - name: Docker image push
         run: docker push ${{ secrets.SWR_DOCKER_REDIS_PATH }}:"$GIT_HASH_SHORT"
@@ -43,9 +43,9 @@ jobs:
             docker ps -q --filter "name=${{ env.DOCKER_CONTAINER_NAME }}" | xargs -r docker stop
             docker ps -aq --filter "name=${{ env.DOCKER_CONTAINER_NAME }}" | xargs -r docker rm -f
             docker run -p 6379:6379 -p 8806:3306 --name=${{ env.DOCKER_CONTAINER_NAME }} --restart=always  \
-            -v /root/work/proj/java-learn/docker-config/redis:/data/config/redis \
-            -v /root/work/proj/java-learn/docker-config/mysql/db:/data/config/mysql/db \
-            -v /root/work/proj/java-learn/docker-config/mysql/log:/data/config/mysql/log \
-            -v /root/work/proj/java-learn/docker-config/mysql/cgroup:/sys/fs/cgroup \
-            -v /root/work/proj/java-learn/docker-config/mysql/my.cnf:/etc/my.cnf \
+            -v /root/work/proj/service-app/docker-config/redis:/data/config/redis \
+            -v /root/work/proj/service-app/docker-config/mysql/db:/data/config/mysql/db \
+            -v /root/work/proj/service-app/docker-config/mysql/log:/data/config/mysql/log \
+            -v /root/work/proj/service-app/docker-config/mysql/cgroup:/sys/fs/cgroup \
+            -v /root/work/proj/service-app/docker-config/mysql/my.cnf:/etc/my.cnf \
             -d ${{ secrets.SWR_DOCKER_REDIS_PATH }}:${{ env.GIT_HASH_SHORT }}

.github/workflows/deploy_server.yml

@@ -69,10 +69,10 @@ jobs:
           script: |
             docker login -u ${{ secrets.SWR_DOCKERHUB_USERNAME }} -p ${{ secrets.SWR_DOCKERHUB_PASSWORD }} swr.cn-north-4.myhuaweicloud.com
             docker pull ${{ secrets.SWR_DOCKER_SERVER_PATH }}:${{ env.GIT_HASH_SHORT }}
-            docker ps -q --filter "name=server-demo-container" | xargs -r docker stop
-            docker ps -aq --filter "name=server-demo-container" | xargs -r docker rm -f
-            docker run -p 8080:8080 --name=server-demo-container --restart=always \
-            -v /root/work/proj/java-learn/docker-config/buckets:/data/buckets \
+            docker ps -q --filter "name=server-app-container" | xargs -r docker stop
+            docker ps -aq --filter "name=server-app-container" | xargs -r docker rm -f
+            docker run -p 8080:8080 --name=server-app-container --restart=always \
+            -v /root/work/proj/service-app/docker-config/buckets:/data/buckets \
             -d ${{ secrets.SWR_DOCKER_SERVER_PATH }}:${{ env.GIT_HASH_SHORT }}
 
 

.gitignore

@@ -44,7 +44,7 @@ server/**/bucket
 
 .DS_Store
 **/.DS_Store
-TencentKona-17.0.10.b1-jdk_linux-x86_64.tar.gz
+TencentKona-17.0.13.b1-jdk_linux-x86_64.tar.gz
 **/secrets.properties
 
 # Ignore Gradle project-specific cache directory

docker/docker_java_base/Dockerfile

@@ -10,5 +10,5 @@ COPY ./assets/* ./
 
 RUN sh ./init.sh
 
-ENV JAVA_HOME /data/software/TencentKona-17.0.10.b1
+ENV JAVA_HOME /data/software/TencentKona-17.0.13.b1
 ENV PATH ${JAVA_HOME}/bin:$PATH

docker/docker_java_base/Readme.md

@@ -1,5 +1,5 @@
 ## 部署
 ``` bash
-docker build -t swr.cn-north-4.myhuaweicloud.com/mark-dev/java_docker_base:v0.0.1 ./
-docker push swr.cn-north-4.myhuaweicloud.com/mark-dev/java_docker_base:v0.0.1
+docker build --platform linux/x86_64 -t swr.cn-north-4.myhuaweicloud.com/mark-app/java_docker_base:v0.0.1 ./
+docker push swr.cn-north-4.myhuaweicloud.com/mark-app/java_docker_base:v0.0.1
 ```

docker/docker_java_base/assets/init.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-tar -zxf ./TencentKona-17.0.10.b1-jdk_linux-x86_64.tar.gz
+tar -zxf ./TencentKona-17.0.13.b1-jdk_linux-x86_64.tar.gz
 
 ## declare an array variable
 declare -a arr=("/root/.bashrc" "/bin/profile")
@@ -10,7 +10,7 @@ for i in "${arr[@]}"
 do
   echo "$i"
   BASHRC_PATH="$i"
-  echo "export JAVA_HOME=/data/software/TencentKona-17.0.10.b1;" >>$BASHRC_PATH
+  echo "export JAVA_HOME=/data/software/TencentKona-17.0.13.b1;" >>$BASHRC_PATH
   source $BASHRC_PATH
   echo "export PATH=$JAVA_HOME/bin:$PATH;" >>$BASHRC_PATH
   source $BASHRC_PATH

docker/docker_redis/README.MD

@@ -0,0 +1,11 @@
+设置环境:
+
+- mysql: 
+``` 
+cp /etc/my.cnf.d/mariadb-server.cnf /root/work/proj/service-app/docker-config/mysql/my.cnf
+```
+
+- redis:
+``` 
+
+```

server/mini_service/Dockerfile

@@ -1,4 +1,4 @@
-from swr.cn-north-4.myhuaweicloud.com/mark-dev/java_docker_base:v0.0.3
+from swr.cn-north-4.myhuaweicloud.com/mark-app/java_docker_base:v0.0.3
 maintainer afcfzf <9301462@qq.com>
 label version="1.0"
 label description="docker for java server"

server/mini_service/Readme.md

@@ -1,11 +1,11 @@
 ## 部署
 ``` bash
-docker build -t swr.cn-north-4.myhuaweicloud.com/mark-dev/server-demo:v0.0.1 ./
-docker push swr.cn-north-4.myhuaweicloud.com/mark-dev/swr-demo-2048:latest
+docker build -t swr.cn-north-4.myhuaweicloud.com/mark-app/server-mini:v0.0.1 ./
+docker push swr.cn-north-4.myhuaweicloud.com/mark-app/server-mini:latest
 ```
 ## 删除
 ``` bash
-docker rmi -f $(docker images 'swr.cn-north-4.myhuaweicloud.com/mark-dev/server-demo' -a -q)
+docker rmi -f $(docker images 'swr.cn-north-4.myhuaweicloud.com/mark-app/server-mini' -a -q)
 ```
 
 ## 环境变量

server/mini_service/release/docker_build.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-DOCKER_NAME=swr.cn-north-4.myhuaweicloud.com/mark-dev/server-demo;
+DOCKER_NAME=swr.cn-north-4.myhuaweicloud.com/mark-app/server-demo;
 DOCKER_VERSION="$(git rev-parse --short HEAD)";
 DOCKER_NAME_WITH_VER=$DOCKER_NAME:$DOCKER_VERSION;
 DOCKER_NAME_WITH_LATEST=$DOCKER_NAME:latest;