db

Author: FriendlyCM

.github/workflows/docker-s3-deploy.yml

@@ -28,23 +28,6 @@ jobs:
             exit 1
           fi
 
-      - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v6
-        with:
-          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
-          passphrase: ${{ secrets.GPG_PASSPHRASE }}
-
-      - name: Sign tron-docker.zip with GPG
-        run: |
-          gpg --detach-sign --armor tron-docker.zip
-          # This creates tron-docker.zip.asc (ASCII-armored signature)
-
-      - name: Export GPG public key to tron-docker-099228E1.pub
-        run: |
-          gpg --armor --export > tron-docker-099228E1.pub
-          # Optional: Set restrictive permissions
-          chmod 600 tron-docker-099228E1.pub
-
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
@@ -54,8 +37,5 @@ jobs:
 
       - name: Upload tron-docker.zip to S3
         run: |
-          aws s3 cp tron-docker-099228E1.pub s3://${{ github.event.inputs.bucket-name }}/public-keys/tron-docker-099228E1.pub
-          aws s3 cp tron-docker.zip.asc s3://${{ github.event.inputs.bucket-name }}/signatures/tron-docker-latest.asc
-          zip -r tron-docker.zip.zip tron-docker.zip
-          aws s3 cp tron-docker.zip.zip s3://${{ github.event.inputs.bucket-name }}/package/publish-latest.zip.zip
-          aws s3 cp tron-docker.zip.zip s3://${{ github.event.inputs.bucket-name }}/package/publish-v0.0.1.zip.zip
+          aws s3 cp tron-docker.zip s3://${{ github.event.inputs.bucket-name }}/package/publish-latest.zip
+          aws s3 cp tron-docker.zip s3://${{ github.event.inputs.bucket-name }}/package/publish-v0.1.1.zip

tools/docker/codepipeline/appspec.yml

@@ -1,8 +1,8 @@
 version: 0.0
 os: linux
 files:
-  - source: docker-compose.fullnode.nile.yml
-    destination: /home/ubuntu/yk/mydev/tron-docker/
+  - source: docker-compose.fullnode.main.yml
+    destination: /data/tron-node/tron-docker/
 hooks:
   BeforeInstall:
     - location: prepare_environment.sh

tools/docker/codepipeline/prepare_environment.sh

@@ -1,17 +1,17 @@
 #!/bin/bash
 
-TARGET_DIR="/home/ubuntu/yk/mydev/tron-docker/"
-DOCKER_COMPOSE_FILE="docker-compose.fullnode.nile.yml"
+TARGET_DIR="/data/tron-node/tron-docker/"
+DOCKER_COMPOSE_FILE="docker-compose.fullnode.mail.yml"
 
 cd ${TARGET_DIR} || exit
-./trond node run-single stop -t full-nile -f ${DOCKER_COMPOSE_FILE}
+./trond node run-single stop -t full-main -f ${DOCKER_COMPOSE_FILE}
 
 # Wait and check if container is stopped
 max_attempts=30  # 2 minutes total (30 * 10 seconds)
 attempt=1
 
 while [ $attempt -le $max_attempts ]; do
-    if ! docker-compose -f ${DOCKER_COMPOSE_FILE} ps --services --filter "status=running" | grep -q "tron-node-nile"; then
+    if ! docker-compose -f ${DOCKER_COMPOSE_FILE} ps --services --filter "status=running" | grep -q "tron-node-mainnet"; then
         echo "Container successfully stopped"
         exit 0
     fi

tools/docker/codepipeline/start_service.sh

@@ -1,17 +1,17 @@
 #!/bin/bash
 
-TARGET_DIR="/home/ubuntu/yk/mydev/tron-docker/"
-DOCKER_COMPOSE_FILE="docker-compose.fullnode.nile.yml"
+TARGET_DIR="/data/tron-node/tron-docker/"
+DOCKER_COMPOSE_FILE="docker-compose.fullnode.mail.yml"
 
 cd ${TARGET_DIR} || exit
-./trond node run-single -t full-nile -f ${DOCKER_COMPOSE_FILE}
+./trond node run-single -t full-main -f ${DOCKER_COMPOSE_FILE}
 
 # Check if container is running
 max_attempts=12  # 2 minutes total (12 * 10 seconds)
 attempt=1
 
 while [ $attempt -le $max_attempts ]; do
-    if docker-compose -f ${DOCKER_COMPOSE_FILE} ps --services --filter "status=running" | grep -q "tron-node-nile"; then
+    if docker-compose -f ${DOCKER_COMPOSE_FILE} ps --services --filter "status=running" | grep -q "tron-node-mainnet"; then
         echo "Container is running, proceeding to API check"
         break
     fi

tools/docker/codepipeline/validate_service.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
 
+TARGET_DIR="/data/tron-node/tron-docker/"
+DOCKER_COMPOSE_FILE="docker-compose.fullnode.mail.yml"
+
 # API health check
 max_attempts=30  # 5 minutes total (30 * 10 seconds)
 attempt=1
 
 while [ $attempt -le $max_attempts ]; do
     response=$(curl -s -X POST http://127.0.0.1:8090/wallet/getblock \
         -H 'Content-Type: application/json; charset=utf-8' \
-        -H 'Host: api.trongrid.io' \
-        -H 'User-Agent: RapidAPI/4.2.8 (Macintosh; OS X/15.3.1) GCDHTTPRequest' \
         -d '{"detail":false}')
 
     if [ -n "$response" ]; then
@@ -23,10 +24,7 @@ done
 
 echo "Node API failed to respond after 5 minutes"
 
-TARGET_DIR="/home/ubuntu/yk/mydev/tron-docker/"
-DOCKER_COMPOSE_FILE="docker-compose.fullnode.nile.yml"
-
 cd ${TARGET_DIR} || exit
-./trond node run-single stop -t full-nile -f ${DOCKER_COMPOSE_FILE}
+./trond node run-single stop -t full-main -f ${DOCKER_COMPOSE_FILE}
 
 exit 1

tools/docker/docker_env/check-install-docker.sh

@@ -47,6 +47,8 @@ check_docker_running() {
             echo "Starting Docker daemon..."
             sudo systemctl start docker
             sleep 5
+            sudo usermod -aG docker "$USER"
+            newgrp docker
             if ! docker info &> /dev/null; then
                 echo "Failed to start Docker daemon"
                 exit 1

tools/trond/cmd/docker/env.go

@@ -16,45 +16,23 @@ var envCmd = &cobra.Command{
 	Long: heredoc.Doc(`
 			Check docker and docker-compose installation on Linux and Mac. If docker and docker-compose are not installed, this command will install them for you.
 
-			For Mac: brew install --cask docker
-
-			For Linux: sh get-docker.sh
+			The tools/docker/docker_env/check-install-docker.sh script will be used to check and install docker and docker-compose.
 		`),
 	Example: heredoc.Doc(`
 			# Check and install docker and docker-compose (for Linux and Mac)
 			$ ./trond docker install-docker
 		`),
 	Run: func(cmd *cobra.Command, args []string) {
-
-		if yes, err := utils.IsJDK1_8(); err != nil || !yes {
-			fmt.Println("Error: JDK version should be 1.8")
-			return
-		}
-
-		// Get the flag value
-		org, _ := cmd.Flags().GetString("org")
-		artifact, _ := cmd.Flags().GetString("artifact")
-		version, _ := cmd.Flags().GetString("version")
-
-		fmt.Println("The building progress may take a long time, depending on your network speed.")
-		fmt.Println("If you don't specify the flags for building, the default values will be used.")
-		fmt.Println("The default result will be: tronprotocol/java-tron:latest")
-		fmt.Println("Start building...")
 		cmds := []string{
-			fmt.Sprintf("./gradlew --no-daemon sourceDocker -PdockerOrgName=%s -PdockerArtifactName=%s -Prelease.releaseVersion=%s", org, artifact, version),
+			"./check-install-docker.sh",
 		}
-		if err := utils.RunMultipleCommands(strings.Join(cmds, " && "), "./tools/gradlew"); err != nil {
+		if err := utils.RunMultipleCommands(strings.Join(cmds, " && "), "./tools/docker/docker_env"); err != nil {
 			fmt.Println("Error: ", err)
 			return
 		}
 	},
 }
 
 func init() {
-
-	envCmd.Flags().StringP("org", "o", "tronprotocol", "OrgName for the docker image")
-	envCmd.Flags().StringP("artifact", "a", "java-tron", "ArtifactName for the docker image")
-	envCmd.Flags().StringP("version", "v", "latest", "Release version for the docker image")
-
 	DockerCmd.AddCommand(envCmd)
 }