fix ci/cd

Author: Dema-koder

.github/workflows/github-actions.yml

@@ -1,4 +1,4 @@
-name: Java CI/CD with Maven
+name: Java CI/CD with Docker Compose
 
 on:
   push:
@@ -56,27 +56,36 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up SSH
-        uses: webfactory/ssh-agent@v0.5.3
+        uses: webfactory/ssh-agent@v0.8.0
         with:
           ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
 
-      - name: Add remote host to known_hosts
-        run: ssh-keyscan -H 5.39.249.253 >> ~/.ssh/known_hosts
+      - name: Add known hosts
+        run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.SERVER_IP }} $(ssh-keyscan -H ${{ secrets.SERVER_IP }} 2>/dev/null)" >> ~/.ssh/known_hosts
 
-      - name: Download build artifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: build-artifacts
-          path: target/
-
-      - name: List files before SCP
-        run: ls -la target/
-
-      - name: Copy files via SCP
-        run: scp -r target/ [email protected]:/root
-
-      - name: Run deployment script
+      - name: Deploy to server
         env:
           BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
           GPT_TOKEN: ${{ secrets.GPT_TOKEN }}
-        run: ssh [email protected] 'BOT_TOKEN=${{ secrets.BOT_TOKEN }} GPT_TOKEN=${{ secrets.GPT_TOKEN }} bash -s' < ./deploy.sh
+          SERVER_IP: ${{ secrets.SERVER_IP }}
+          SERVER_USER: ${{ secrets.SERVER_USER }}
+        run: |
+          ssh $SERVER_USER@$SERVER_IP << 'EOF'
+            if [ -d "Automating-route-selection" ]; then
+              cd Automating-route-selection
+              git pull origin main
+            else
+              git clone https://github.com/Dema-koder/Automating-route-selection.git
+              cd Automating-route-selection
+            fi
+    
+            # Создаем .env файл с секретами
+            echo "BOT_TOKEN=$BOT_TOKEN" > .env
+            echo "GPT_TOKEN=$GPT_TOKEN" >> .env
+    
+            # Запускаем приложение
+            docker-compose down
+            docker-compose up -d --build
+          EOF

.gitignore

@@ -35,4 +35,7 @@ build/
 .vscode/
 
 ### Mac OS ###
-.DS_Store
+.DS_Store
+
+.env
+logback-test.xml

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

Dockerfile

@@ -0,0 +1,15 @@
+FROM eclipse-temurin:22-jdk as builder
+WORKDIR /app
+
+COPY . .
+
+RUN chmod +x mvnw && \
+    ./mvnw clean package -DskipTests
+
+FROM eclipse-temurin:22-jre-alpine
+WORKDIR /app
+
+COPY --from=builder /app/target/*.jar app.jar
+
+EXPOSE 8080
+ENTRYPOINT ["java", "-jar", "app.jar"]

docker-compose.yml

@@ -0,0 +1,43 @@
+version: '3.8'
+
+services:
+  postgres:
+    image: postgres:15
+    container_name: postgres
+    environment:
+      POSTGRES_USER: app_user
+      POSTGRES_PASSWORD: secretpass
+      POSTGRES_DB: app_db
+    ports:
+      - "5433:5432"
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U app_user -d app_db"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: app
+    depends_on:
+      postgres:
+        condition: service_healthy
+    env_file:
+      - .env
+    environment:
+      SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/app_db
+      SPRING_DATASOURCE_USERNAME: app_user
+      SPRING_DATASOURCE_PASSWORD: secretpass
+      SPRING_JPA_HIBERNATE_DDL-AUTO: update
+      BOT_TOKEN: ${BOT_TOKEN}
+      GPT_TOKEN: ${GPT_TOKEN}
+    ports:
+      - "8080:8080"
+    restart: unless-stopped
+
+volumes:
+  postgres_data: