Compare commits

..

No commits in common. "5b5494108c1fff13e4f5339fca56110091d638d3" and "3de92f48d9766fec74c53b715c9959b196526faf" have entirely different histories.

7 changed files with 13 additions and 80 deletions

View File

@ -1,47 +0,0 @@
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
name: CI
on:
push:
branches: ['main']
pull_request:
branches: ['main']
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
registry: ${{ secrets.DOCKER_REGISTRY }}
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- uses: actions/checkout@v3
- name: Build the Docker image
run: |
docker build . --file Dockerfile --tag registry.ctdn.net/spring-web-api:latest
docker push registry.ctdn.net/spring-web-api:latest
deploy:
runs-on: self-hosted
steps:
- name: Cloning repo
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Push to dokku
uses: dokku/github-action@master
with:
git_remote_url: 'ssh://dokku@heroku.ctdn.net:2222/spring-web-modules'
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
branch: main
git_push_flags: --force

19
Jenkinsfile vendored
View File

@ -1,19 +0,0 @@
pipeline {
agent any
triggers {
pollSCM '* * * * *'
}
stages {
stage('Build') {
steps {
sh './gradlew assemble'
}
}
stage('BootJar') {
steps {
sh './gradlew bootJar'
}
}
}
}

View File

@ -1,17 +1,16 @@
# CUBETIQ Web Modules (Template) # CUBETIQ Web Modules (Template)
- Setup and Default Web Configuration - Setup and Default Web Configuration
- Swagger UI and API's Documentation (SpringDoc) - Swagger UI and API's Documentation (SpringFox)
- General Purpose for External and Internal use-cases - General Purpose for External and Internal use-cases
- Dockerfile and Docker profile build support - Dockerfile and Docker profile build support
- Kubernetes support - Kubernetes support
- Jenkins Support
### Language and Framework ### Language and Framework
- Spring Boot: 2.7.3 - Spring Boot: 2.7.0
- Kotlin: 1.7.10 - Kotlin: 1.7.0
- Gradle: 7.5 - Gradle: 7.4.1
# Modules # Modules

View File

@ -38,7 +38,7 @@ dependencies {
implementation("org.springframework.boot:spring-boot-starter-data-redis") implementation("org.springframework.boot:spring-boot-starter-data-redis")
// Migrating from SpringFox // Migrating from SpringFox
implementation("org.springdoc:springdoc-openapi-ui:1.6.11") implementation("org.springdoc:springdoc-openapi-ui:1.6.9")
// SPRING FRAMEWORK AND CORE // SPRING FRAMEWORK AND CORE
implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-web")

View File

@ -6,6 +6,6 @@ APP_PROFILE=demo
VERSION=demo VERSION=demo
IMAGE=spring-web-api IMAGE=spring-web-api
CONTAINER=$IMAGE CONTAINER=$IMAGE
REGISTRY=registry.ctdn.net REGISTRY=registry.kh.cubetiqs.com
EXPOSE_PORT=8080 EXPOSE_PORT=8080
ROOT_HUB=$REGISTRY/$IMAGE:$VERSION ROOT_HUB=$REGISTRY/$IMAGE:$VERSION

View File

@ -1,11 +1,11 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
id("org.springframework.boot") version "2.7.4" apply false id("org.springframework.boot") version "2.7.0" apply false
id("io.spring.dependency-management") version "1.0.14.RELEASE" apply false id("io.spring.dependency-management") version "1.0.11.RELEASE" apply false
kotlin("jvm") version "1.7.20" apply false kotlin("jvm") version "1.7.0" apply false
kotlin("plugin.spring") version "1.7.10" apply false kotlin("plugin.spring") version "1.7.0" apply false
kotlin("plugin.jpa") version "1.7.10" apply false kotlin("plugin.jpa") version "1.7.0" apply false
} }
allprojects { allprojects {

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists