Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 48cd8d242f | |||
| b9c39ad990 | |||
| 3de734dbc5 | |||
| 52f40e3d92 | |||
| 3bffa43d6a | |||
| 63660928c9 | |||
| f1c9965396 | |||
| d7a2af9928 | |||
| 2dc1ac17f1 | |||
| 03c509c597 | |||
| 9e35d730f4 | |||
| 0df22454a3 | |||
| c9dea2a91d | |||
| 8ee2abdbd7 | |||
| 35db41573a | |||
| bf5c9f1650 | |||
| bd2d32fa8c | |||
| a3a3917fc0 |
@ -2,3 +2,4 @@ CLOUDFLARE_ACCOUNT_ID="<cloudflare account id>"
|
|||||||
CLOUDFLARE_API_KEY="<cloudflare account key>"
|
CLOUDFLARE_API_KEY="<cloudflare account key>"
|
||||||
CLOUDFLARE_EMAIL="<cloudflare email>"
|
CLOUDFLARE_EMAIL="<cloudflare email>"
|
||||||
ENV="<deployment env>"
|
ENV="<deployment env>"
|
||||||
|
MGMT_PORT="5003"
|
||||||
138
.gitea/workflows/cftunnels_build_push.yml
Normal file
138
.gitea/workflows/cftunnels_build_push.yml
Normal file
@ -0,0 +1,138 @@
|
|||||||
|
name: Build & Push CFTunnels
|
||||||
|
run-name: CF Build started by ${{ gitea.actor }}
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- test # → PATCH bump, build & tag as test
|
||||||
|
- main # → MINOR bump, promote test→prod
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
version:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
outputs:
|
||||||
|
new_version: ${{ steps.semver.outputs.new_version }}
|
||||||
|
target_env: ${{ steps.env.outputs.target_env }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Determine environment
|
||||||
|
id: env
|
||||||
|
run: |
|
||||||
|
[[ "${{ github.ref_name }}" == "main" ]] && ENV="prod" || ENV="${{ github.ref_name }}"
|
||||||
|
if [[ "$ENV" != "test" && "$ENV" != "prod" ]]; then
|
||||||
|
echo "→ Invalid environment: $ENV. Must be 'test' or 'prod'."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "target_env=$ENV" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
- name: Calculate semver bump
|
||||||
|
id: semver
|
||||||
|
run: |
|
||||||
|
VERSION=$(git describe --tags --match "cf-*" --abbrev=0 2>/dev/null || echo "cf-0.0.0")
|
||||||
|
echo "Latest tag: ${VERSION}"
|
||||||
|
# Strip cf- prefix
|
||||||
|
VERSION=${VERSION#cf-}
|
||||||
|
MAJOR=$(echo ${VERSION} | cut -d "." -f 1)
|
||||||
|
MINOR=$(echo ${VERSION} | cut -d "." -f 2)
|
||||||
|
PATCH=$(echo ${VERSION} | cut -d "." -f 3)
|
||||||
|
|
||||||
|
if [[ "${{ steps.env.outputs.target_env }}" == "prod" ]]; then
|
||||||
|
# MINOR bump, reset PATCH
|
||||||
|
NEW_MINOR=$((MINOR + 1))
|
||||||
|
NEW_VERSION="${MAJOR}.${NEW_MINOR}.0"
|
||||||
|
echo "Production → minor bump: ${NEW_VERSION}"
|
||||||
|
else
|
||||||
|
# test → PATCH bump
|
||||||
|
NEW_PATCH=$((PATCH + 1))
|
||||||
|
NEW_VERSION="${MAJOR}.${MINOR}.${NEW_PATCH}"
|
||||||
|
echo "Test → patch bump: ${NEW_VERSION}"
|
||||||
|
fi
|
||||||
|
echo "new_version=cf-${NEW_VERSION}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
build-and-push:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: version
|
||||||
|
container:
|
||||||
|
image: 192.168.0.100:8928/hithomelabs/ci-runner:1.0.0
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Install JDK (Alpine package)
|
||||||
|
run: |
|
||||||
|
apk add --no-cache openjdk17-jdk
|
||||||
|
echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk" >> "$GITHUB_ENV"
|
||||||
|
|
||||||
|
- name: Validate Gradle Wrapper (offline checksum)
|
||||||
|
run: |
|
||||||
|
sha256sum --check gradle/wrapper/gradle-wrapper.jar.sha256
|
||||||
|
|
||||||
|
- name: Create and push git tag
|
||||||
|
run: |
|
||||||
|
echo "New version: ${{ needs.version.outputs.new_version }}"
|
||||||
|
git config --global user.name "${{ gitea.actor }}"
|
||||||
|
git config --global user.email "${{ gitea.actor }}@users.noreply.github.com"
|
||||||
|
git tag -a "${{ needs.version.outputs.new_version }}" \
|
||||||
|
-m "Push CF version ${{ needs.version.outputs.new_version }}"
|
||||||
|
git push origin "${{ needs.version.outputs.new_version }}"
|
||||||
|
|
||||||
|
- name: Log in to Gitea Docker Registry
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
registry: 'http://192.168.0.100:8928'
|
||||||
|
username: hitanshu
|
||||||
|
password: ${{ secrets.TOKEN }}
|
||||||
|
|
||||||
|
- name: Build image (test) or promote (prod)
|
||||||
|
run: |
|
||||||
|
ENV="${{ needs.version.outputs.target_env }}"
|
||||||
|
VER="${{ needs.version.outputs.new_version }}"
|
||||||
|
REG="192.168.0.100:8928/hithomelabs/cftunnels"
|
||||||
|
|
||||||
|
if [[ "$ENV" == "test" ]]; then
|
||||||
|
echo "→ Building fresh image for test"
|
||||||
|
./gradlew :cftunnels-service:bootBuildImage --imageName="${REG}:${VER}"
|
||||||
|
docker tag "${REG}:${VER}" "${REG}:test"
|
||||||
|
docker push "${REG}:test"
|
||||||
|
docker push "${REG}:${VER}"
|
||||||
|
else
|
||||||
|
echo "→ Promoting test image to prod"
|
||||||
|
docker pull "${REG}:test"
|
||||||
|
docker tag "${REG}:test" "${REG}:${VER}"
|
||||||
|
docker tag "${REG}:${VER}" "${REG}:prod"
|
||||||
|
docker push "${REG}:prod"
|
||||||
|
docker push "${REG}:${VER}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Set Portainer deploy variables
|
||||||
|
id: portainer-vars
|
||||||
|
run: |
|
||||||
|
ENV="${{ needs.version.outputs.target_env }}"
|
||||||
|
if [[ "$ENV" == "prod" ]]; then
|
||||||
|
echo "url=http://192.168.0.100:8082" >> $GITHUB_OUTPUT
|
||||||
|
echo "stack=${{ vars.CFTUNNELS_PROD_STACK_ID }}" >> $GITHUB_OUTPUT
|
||||||
|
echo "key=${{ secrets.PORTAINER_SERVICE_API_KEY_PROD }}" >> $GITHUB_OUTPUT
|
||||||
|
else
|
||||||
|
echo "url=http://192.168.0.100:8081" >> $GITHUB_OUTPUT
|
||||||
|
echo "stack=${{ vars.CFTUNNELS_DEV_STACK_ID }}" >> $GITHUB_OUTPUT
|
||||||
|
echo "key=${{ secrets.PORTAINER_SERVICE_API_KEY }}" >> $GITHUB_OUTPUT
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Trigger Portainer Redeploy
|
||||||
|
if: success()
|
||||||
|
env:
|
||||||
|
PORTAINER_AUTOMATION_URL: ${{ steps.portainer-vars.outputs.url }}
|
||||||
|
STACK_ID: ${{ steps.portainer-vars.outputs.stack }}
|
||||||
|
API_KEY: ${{ steps.portainer-vars.outputs.key }}
|
||||||
|
run: |
|
||||||
|
wget -q --no-check-certificate --timeout=30 \
|
||||||
|
--post-data= \
|
||||||
|
--header="X-API-Key: $API_KEY" \
|
||||||
|
-O - \
|
||||||
|
"$PORTAINER_AUTOMATION_URL/api/deploy/$STACK_ID" 2>&1 \
|
||||||
|
|| echo "Deploy trigger failed (non-fatal)"
|
||||||
@ -7,15 +7,6 @@ on:
|
|||||||
- test # → PATCH bump, build & tag as test
|
- test # → PATCH bump, build & tag as test
|
||||||
- main # → MINOR bump, promote test→prod
|
- main # → MINOR bump, promote test→prod
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
|
||||||
environment:
|
|
||||||
description: 'Target environment (test → PATCH bump, prod → MINOR bump)'
|
|
||||||
required: true
|
|
||||||
default: 'test'
|
|
||||||
type: choice
|
|
||||||
options:
|
|
||||||
- test
|
|
||||||
- prod
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
version:
|
version:
|
||||||
@ -31,15 +22,9 @@ jobs:
|
|||||||
- name: Determine environment
|
- name: Determine environment
|
||||||
id: env
|
id: env
|
||||||
run: |
|
run: |
|
||||||
if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
|
[[ "${{ github.ref_name }}" == "main" ]] && ENV="prod" || ENV="${{ github.ref_name }}"
|
||||||
ENV="${{ inputs.environment }}"
|
|
||||||
else
|
|
||||||
# Push events: test branch → test env, main branch → prod env
|
|
||||||
[[ "${{ github.ref_name }}" == "main" ]] && ENV="prod" || ENV="${{ github.ref_name }}"
|
|
||||||
fi
|
|
||||||
# Validate
|
|
||||||
if [[ "$ENV" != "test" && "$ENV" != "prod" ]]; then
|
if [[ "$ENV" != "test" && "$ENV" != "prod" ]]; then
|
||||||
echo "❌ Invalid environment: $ENV. Must be 'test' or 'prod'."
|
echo "→ Invalid environment: $ENV. Must be 'test' or 'prod'."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
echo "target_env=$ENV" >> $GITHUB_OUTPUT
|
echo "target_env=$ENV" >> $GITHUB_OUTPUT
|
||||||
@ -47,8 +32,10 @@ jobs:
|
|||||||
- name: Calculate semver bump
|
- name: Calculate semver bump
|
||||||
id: semver
|
id: semver
|
||||||
run: |
|
run: |
|
||||||
VERSION=$(git describe --tags --abbrev=0 2>/dev/null || echo "0.0.0")
|
VERSION=$(git describe --tags --match "pa-*" --abbrev=0 2>/dev/null || echo "pa-0.0.0")
|
||||||
echo "Latest tag: ${VERSION}"
|
echo "Latest tag: ${VERSION}"
|
||||||
|
# Strip pa- prefix
|
||||||
|
VERSION=${VERSION#pa-}
|
||||||
MAJOR=$(echo ${VERSION} | cut -d "." -f 1)
|
MAJOR=$(echo ${VERSION} | cut -d "." -f 1)
|
||||||
MINOR=$(echo ${VERSION} | cut -d "." -f 2)
|
MINOR=$(echo ${VERSION} | cut -d "." -f 2)
|
||||||
PATCH=$(echo ${VERSION} | cut -d "." -f 3)
|
PATCH=$(echo ${VERSION} | cut -d "." -f 3)
|
||||||
@ -64,7 +51,7 @@ jobs:
|
|||||||
NEW_VERSION="${MAJOR}.${MINOR}.${NEW_PATCH}"
|
NEW_VERSION="${MAJOR}.${MINOR}.${NEW_PATCH}"
|
||||||
echo "Test → patch bump: ${NEW_VERSION}"
|
echo "Test → patch bump: ${NEW_VERSION}"
|
||||||
fi
|
fi
|
||||||
echo "new_version=${NEW_VERSION}" >> $GITHUB_OUTPUT
|
echo "new_version=pa-${NEW_VERSION}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
build-and-push:
|
build-and-push:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
@ -108,13 +95,13 @@ jobs:
|
|||||||
REG="192.168.0.100:8928/hithomelabs/portainer-automation"
|
REG="192.168.0.100:8928/hithomelabs/portainer-automation"
|
||||||
|
|
||||||
if [[ "$ENV" == "test" ]]; then
|
if [[ "$ENV" == "test" ]]; then
|
||||||
echo "🔨 Building fresh image for test"
|
echo "→ Building fresh image for test"
|
||||||
./gradlew :portainer-automation:bootBuildImage --imageName="${REG}:${VER}"
|
./gradlew :portainer-automation:bootBuildImage --imageName="${REG}:${VER}"
|
||||||
docker tag "${REG}:${VER}" "${REG}:test"
|
docker tag "${REG}:${VER}" "${REG}:test"
|
||||||
docker push "${REG}:test"
|
docker push "${REG}:test"
|
||||||
docker push "${REG}:${VER}"
|
docker push "${REG}:${VER}"
|
||||||
else
|
else
|
||||||
echo "♻️ Promoting test image to prod"
|
echo "→ Promoting test image to prod"
|
||||||
docker pull "${REG}:test"
|
docker pull "${REG}:test"
|
||||||
docker tag "${REG}:test" "${REG}:${VER}"
|
docker tag "${REG}:test" "${REG}:${VER}"
|
||||||
docker tag "${REG}:${VER}" "${REG}:prod"
|
docker tag "${REG}:${VER}" "${REG}:prod"
|
||||||
|
|||||||
@ -1,69 +0,0 @@
|
|||||||
name: Promote image with tag test to prod
|
|
||||||
run-name: Build started by $ {{gitea.actor}}
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [main]
|
|
||||||
jobs:
|
|
||||||
tag:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
outputs:
|
|
||||||
new_version: ${{ steps.new_version.outputs.new_version }}
|
|
||||||
steps:
|
|
||||||
- name: Check out repository code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
- name: Get new version
|
|
||||||
id: new_version
|
|
||||||
run: |
|
|
||||||
VERSION=$(git describe --tags --abbrev=0)
|
|
||||||
echo ${VERSION}
|
|
||||||
MAJOR=$(echo ${VERSION} | cut -d "." -f 1)
|
|
||||||
MINOR=$(echo ${VERSION} | cut -d "." -f 2)
|
|
||||||
PATCH=0
|
|
||||||
NEW_MINOR=$(( ${MINOR} + 1))
|
|
||||||
echo ${NEW_MINOR}
|
|
||||||
echo "new_version=$(echo "${MAJOR}.${NEW_MINOR}.${PATCH}")" >> $GITHUB_OUTPUT
|
|
||||||
build_tag_push:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
needs: tag
|
|
||||||
container:
|
|
||||||
image: 192.168.0.100:8928/hithomelabs/ci-runner:1.0.0
|
|
||||||
steps:
|
|
||||||
- name: Check out repository code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
- name: Create and push tag
|
|
||||||
run: |
|
|
||||||
echo "NEW_VERSION=${{ needs.tag.outputs.new_version }}"
|
|
||||||
git config --global user.name "${{gitea.actor}}"
|
|
||||||
git config --global user.email "${{ gitea.actor }}@users.noreply.github.com"
|
|
||||||
git tag -a ${{ needs.tag.outputs.new_version }} -m "Pushing new version ${{ needs.tag.outputs.new_version }}"
|
|
||||||
git push origin ${{ needs.tag.outputs.new_version }}
|
|
||||||
- name: Log in to Gitea Docker Registry
|
|
||||||
uses: docker/login-action@v3
|
|
||||||
with:
|
|
||||||
registry: 'http://192.168.0.100:8928'
|
|
||||||
username: hitanshu
|
|
||||||
password: ${{ secrets.TOKEN }}
|
|
||||||
- name: Tag prod image
|
|
||||||
run: |
|
|
||||||
docker tag 192.168.0.100:8928/hithomelabs/cftunnels:test 192.168.0.100:8928/hithomelabs/cftunnels:${{ needs.tag.outputs.new_version }}
|
|
||||||
docker tag 192.168.0.100:8928/hithomelabs/cftunnels:${{ needs.tag.outputs.new_version }} 192.168.0.100:8928/hithomelabs/cftunnels:prod
|
|
||||||
- name: Push to Gitea Registry
|
|
||||||
run: |
|
|
||||||
docker push 192.168.0.100:8928/hithomelabs/cftunnels:prod
|
|
||||||
docker push 192.168.0.100:8928/hithomelabs/cftunnels:${{ needs.tag.outputs.new_version }}
|
|
||||||
- name: Trigger Portainer Redeploy (Prod)
|
|
||||||
if: success()
|
|
||||||
env:
|
|
||||||
PORTAINER_AUTOMATION_URL: "http://192.168.0.100:8082"
|
|
||||||
STACK_ID: ${{ vars.CFTUNNELS_PROD_STACK_ID }}
|
|
||||||
API_KEY: ${{ secrets.PORTAINER_SERVICE_API_KEY_PROD }}
|
|
||||||
run: |
|
|
||||||
wget -q --no-check-certificate --timeout=30 \
|
|
||||||
--header="X-API-Key: $API_KEY" \
|
|
||||||
-O - \
|
|
||||||
"$PORTAINER_AUTOMATION_URL/api/deploy/$STACK_ID" 2>&1 \
|
|
||||||
|| echo "Deploy trigger failed (non-fatal)"
|
|
||||||
@ -1,78 +0,0 @@
|
|||||||
name: sample gradle build and test
|
|
||||||
run-name: Build started by ${{ gitea.actor }}
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [test]
|
|
||||||
jobs:
|
|
||||||
tag:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
outputs:
|
|
||||||
new_version: ${{ steps.new_version.outputs.new_version }}
|
|
||||||
steps:
|
|
||||||
- name: Check out repository code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Get new version
|
|
||||||
id: new_version
|
|
||||||
run: |
|
|
||||||
VERSION=$(git describe --tags --abbrev=0)
|
|
||||||
echo "Current version: ${VERSION}"
|
|
||||||
MAJOR=$(echo ${VERSION} | cut -d "." -f 1)
|
|
||||||
MINOR=$(echo ${VERSION} | cut -d "." -f 2)
|
|
||||||
PATCH=$(echo ${VERSION} | cut -d "." -f 3)
|
|
||||||
NEW_PATCH=$((PATCH + 1))
|
|
||||||
NEW_VERSION="${MAJOR}.${MINOR}.${NEW_PATCH}"
|
|
||||||
echo "New version: ${NEW_VERSION}"
|
|
||||||
echo "new_version=${NEW_VERSION}" >> $GITHUB_OUTPUT
|
|
||||||
build_tag_push:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
needs: tag
|
|
||||||
container:
|
|
||||||
image: 192.168.0.100:8928/hithomelabs/ci-runner:1.0.0
|
|
||||||
steps:
|
|
||||||
- name: Check out repository code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
- name: Install JDK (Alpine package)
|
|
||||||
run: |
|
|
||||||
apk add --no-cache openjdk17-jdk
|
|
||||||
echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk" >> "$GITHUB_ENV"
|
|
||||||
- name: Validate Gradle Wrapper (offline checksum)
|
|
||||||
run: |
|
|
||||||
sha256sum --check gradle/wrapper/gradle-wrapper.jar.sha256
|
|
||||||
- name: Create and push tag
|
|
||||||
run: |
|
|
||||||
echo "New version: ${{ needs.tag.outputs.new_version }}"
|
|
||||||
git config --global user.name "${{ gitea.actor }}"
|
|
||||||
git config --global user.email "${{ gitea.actor }}@users.noreply.github.com"
|
|
||||||
git tag -a "${{ needs.tag.outputs.new_version }}" -m "Pushing new version ${{ needs.tag.outputs.new_version }}"
|
|
||||||
git push origin "${{ needs.tag.outputs.new_version }}"
|
|
||||||
- name: Log in to Gitea Docker Registry
|
|
||||||
uses: docker/login-action@v3
|
|
||||||
with:
|
|
||||||
registry: 'http://192.168.0.100:8928'
|
|
||||||
username: hitanshu
|
|
||||||
password: ${{ secrets.TOKEN }}
|
|
||||||
- name: Gradle build
|
|
||||||
run: ./gradlew :cftunnels-service:bootBuildImage --imageName=192.168.0.100:8928/hithomelabs/cftunnels:${{ needs.tag.outputs.new_version }}
|
|
||||||
- name: Tag image as test
|
|
||||||
run: docker tag 192.168.0.100:8928/hithomelabs/cftunnels:${{ needs.tag.outputs.new_version }} 192.168.0.100:8928/hithomelabs/cftunnels:test
|
|
||||||
- name: Push to Gitea Registry
|
|
||||||
run: |
|
|
||||||
docker push 192.168.0.100:8928/hithomelabs/cftunnels:test
|
|
||||||
docker push 192.168.0.100:8928/hithomelabs/cftunnels:${{ needs.tag.outputs.new_version }}
|
|
||||||
- name: Trigger Portainer Redeploy (Dev)
|
|
||||||
if: success()
|
|
||||||
env:
|
|
||||||
PORTAINER_AUTOMATION_URL: "http://192.168.0.100:8081"
|
|
||||||
STACK_ID: ${{ vars.CFTUNNELS_DEV_STACK_ID }}
|
|
||||||
API_KEY: ${{ secrets.PORTAINER_SERVICE_API_KEY }}
|
|
||||||
run: |
|
|
||||||
wget -q --no-check-certificate --timeout=30 \
|
|
||||||
--header="X-API-Key: $API_KEY" \
|
|
||||||
-O - \
|
|
||||||
"$PORTAINER_AUTOMATION_URL/api/deploy/$STACK_ID" 2>&1 \
|
|
||||||
|| echo "Deploy trigger failed (non-fatal)"
|
|
||||||
@ -9,4 +9,5 @@ RUN ./gradlew :cftunnels-service:bootJar
|
|||||||
|
|
||||||
FROM openjdk:17-jdk-slim
|
FROM openjdk:17-jdk-slim
|
||||||
COPY --from=build /app/cftunnels-service/build/libs/*.jar app.jar
|
COPY --from=build /app/cftunnels-service/build/libs/*.jar app.jar
|
||||||
|
EXPOSE 8080 8081
|
||||||
ENTRYPOINT ["java", "-jar", "/app.jar"]
|
ENTRYPOINT ["java", "-jar", "/app.jar"]
|
||||||
|
|||||||
@ -7,6 +7,7 @@ dependencies {
|
|||||||
implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
|
implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
|
||||||
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
|
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
|
||||||
implementation 'org.springframework.boot:spring-boot-starter-security'
|
implementation 'org.springframework.boot:spring-boot-starter-security'
|
||||||
|
implementation 'org.springframework.boot:spring-boot-starter-actuator'
|
||||||
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.5'
|
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.5'
|
||||||
implementation 'org.hibernate.validator:hibernate-validator'
|
implementation 'org.hibernate.validator:hibernate-validator'
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,39 @@
|
|||||||
|
package com.hithomelabs.cftunnels.Config.Security;
|
||||||
|
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.core.Ordered;
|
||||||
|
import org.springframework.core.annotation.Order;
|
||||||
|
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
||||||
|
import org.springframework.security.web.SecurityFilterChain;
|
||||||
|
import org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Security configuration for Spring Boot Actuator endpoints.
|
||||||
|
*
|
||||||
|
* This configuration permits unauthenticated access to /actuator/health and /actuator/info
|
||||||
|
* endpoints, enabling health monitoring by Uptime Kuma without requiring OIDC authentication.
|
||||||
|
* All other actuator endpoints remain protected and require authentication.
|
||||||
|
*
|
||||||
|
* Uses @Order(Ordered.HIGHEST_PRECEDENCE) to ensure this filter chain is evaluated BEFORE
|
||||||
|
* any auto-configured management security filter chains (e.g., ManagementWebSecurityAutoConfiguration).
|
||||||
|
* Without this, the catch-all SecurityFilterChain in SecuirtyConfig can intercept actuator
|
||||||
|
* requests on the separate management port (management.server.port=8081) and redirect to OIDC login.
|
||||||
|
*/
|
||||||
|
@Configuration
|
||||||
|
@Order(Ordered.HIGHEST_PRECEDENCE)
|
||||||
|
public class ActuatorSecurityConfig {
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public SecurityFilterChain actuatorSecurityChain(HttpSecurity http) throws Exception {
|
||||||
|
http
|
||||||
|
.securityMatcher(EndpointRequest.toAnyEndpoint())
|
||||||
|
.authorizeHttpRequests(auth -> auth
|
||||||
|
.requestMatchers("/actuator/health", "/actuator/info").permitAll()
|
||||||
|
.anyRequest().authenticated()
|
||||||
|
)
|
||||||
|
.csrf(csrf -> csrf.disable());
|
||||||
|
|
||||||
|
return http.build();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -29,6 +29,7 @@ public class SecuirtyConfig {
|
|||||||
http
|
http
|
||||||
.authorizeHttpRequests(auth -> auth
|
.authorizeHttpRequests(auth -> auth
|
||||||
//.requestMatchers( "/v3/api-docs/**", "/swagger-ui/**", "/swagger-ui.html" ).permitAll()
|
//.requestMatchers( "/v3/api-docs/**", "/swagger-ui/**", "/swagger-ui.html" ).permitAll()
|
||||||
|
.requestMatchers("/actuator/health", "/actuator/info").permitAll()
|
||||||
.anyRequest().authenticated()
|
.anyRequest().authenticated()
|
||||||
).csrf(csrf -> csrf.disable())
|
).csrf(csrf -> csrf.disable())
|
||||||
.with(new OAuth2LoginConfigurer<>(),
|
.with(new OAuth2LoginConfigurer<>(),
|
||||||
|
|||||||
@ -5,3 +5,7 @@ spring.datasource.driver-class-name=org.h2.Driver
|
|||||||
spring.datasource.username=sa
|
spring.datasource.username=sa
|
||||||
spring.datasource.password=
|
spring.datasource.password=
|
||||||
spring.jpa.hibernate.ddl-auto=none
|
spring.jpa.hibernate.ddl-auto=none
|
||||||
|
|
||||||
|
# Actuator configuration for CI
|
||||||
|
management.endpoints.web.exposure.include=health,info
|
||||||
|
management.endpoint.health.show-details=never
|
||||||
@ -1,8 +1,10 @@
|
|||||||
api.baseUrl=http://localhost:8080
|
api.baseUrl=http://localhost:8080
|
||||||
|
|
||||||
management.health.db.enabled=true
|
# Actuator configuration for local development
|
||||||
management.endpoints.web.exposure.include=health
|
management.server.port=8081
|
||||||
|
management.endpoints.web.exposure.include=health,info
|
||||||
management.endpoint.health.show-details=always
|
management.endpoint.health.show-details=always
|
||||||
|
management.health.db.enabled=true
|
||||||
|
|
||||||
logging.level.org.hibernate.SQL=DEBUG
|
logging.level.org.hibernate.SQL=DEBUG
|
||||||
debug=true
|
debug=true
|
||||||
|
|||||||
@ -10,3 +10,7 @@ spring.datasource.driver-class-name=org.postgresql.Driver
|
|||||||
spring.jpa.hibernate.ddl-auto=create-drop
|
spring.jpa.hibernate.ddl-auto=create-drop
|
||||||
spring.jpa.show-sql=false
|
spring.jpa.show-sql=false
|
||||||
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
|
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
|
||||||
|
|
||||||
|
# Actuator configuration
|
||||||
|
management.endpoints.web.exposure.include=health,info
|
||||||
|
management.endpoint.health.show-details=when-authorized
|
||||||
@ -10,3 +10,7 @@ spring.datasource.driver-class-name=org.postgresql.Driver
|
|||||||
spring.jpa.hibernate.ddl-auto=update
|
spring.jpa.hibernate.ddl-auto=update
|
||||||
spring.jpa.show-sql=true
|
spring.jpa.show-sql=true
|
||||||
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
|
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
|
||||||
|
|
||||||
|
# Actuator configuration
|
||||||
|
management.endpoints.web.exposure.include=health,info
|
||||||
|
management.endpoint.health.show-details=when-authorized
|
||||||
|
|||||||
@ -36,3 +36,8 @@ spring.jpa.show-sql=true
|
|||||||
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
|
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
|
||||||
|
|
||||||
spring.jpa.open-in-view=false
|
spring.jpa.open-in-view=false
|
||||||
|
|
||||||
|
# Actuator configuration - management port and exposed endpoints
|
||||||
|
management.server.port=8081
|
||||||
|
management.endpoints.web.exposure.include=health,info
|
||||||
|
management.endpoint.health.show-details=when-authorized
|
||||||
@ -4,6 +4,7 @@ services:
|
|||||||
container_name: cftunnels_${ENV}
|
container_name: cftunnels_${ENV}
|
||||||
ports:
|
ports:
|
||||||
- ${HOST_PORT}:8080
|
- ${HOST_PORT}:8080
|
||||||
|
- ${MGMT_PORT:-5003}:8081
|
||||||
environment:
|
environment:
|
||||||
- CLOUDFLARE_ACCOUNT_ID=${CLOUDFLARE_ACCOUNT_ID}
|
- CLOUDFLARE_ACCOUNT_ID=${CLOUDFLARE_ACCOUNT_ID}
|
||||||
- CLOUDFLARE_API_KEY=${CLOUDFLARE_API_KEY}
|
- CLOUDFLARE_API_KEY=${CLOUDFLARE_API_KEY}
|
||||||
@ -30,15 +31,3 @@ services:
|
|||||||
- "${DB_PORT}:5432"
|
- "${DB_PORT}:5432"
|
||||||
volumes:
|
volumes:
|
||||||
- ${DB_PATH}:/var/lib/postgresql/data
|
- ${DB_PATH}:/var/lib/postgresql/data
|
||||||
portainer-automation:
|
|
||||||
image: gitea.hithomelabs.com/hithomelabs/portainer-automation:${ENV}
|
|
||||||
container_name: portainer-automation_${ENV}
|
|
||||||
ports:
|
|
||||||
- "${PORTAINER_AUTOMATION_PORT:-8081}:8081"
|
|
||||||
environment:
|
|
||||||
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE:-local}
|
|
||||||
- PORTAINER_API_KEY=${PORTAINER_API_KEY}
|
|
||||||
- PORTAINER_SERVICE_API_KEY=${PORTAINER_SERVICE_API_KEY}
|
|
||||||
env_file:
|
|
||||||
- stack.env
|
|
||||||
restart: unless-stopped
|
|
||||||
@ -36,3 +36,6 @@ ENV=dev
|
|||||||
|
|
||||||
# Host port to map to container port 8081
|
# Host port to map to container port 8081
|
||||||
HOST_PORT=8081
|
HOST_PORT=8081
|
||||||
|
|
||||||
|
# Host port to map to actuator management port 8082 (health checks, LAN only)
|
||||||
|
MGMT_PORT=5005
|
||||||
|
|||||||
@ -9,4 +9,5 @@ RUN ./gradlew :portainer-automation:bootJar
|
|||||||
|
|
||||||
FROM openjdk:17-jdk-slim
|
FROM openjdk:17-jdk-slim
|
||||||
COPY --from=build /app/portainer-automation/build/libs/*.jar app.jar
|
COPY --from=build /app/portainer-automation/build/libs/*.jar app.jar
|
||||||
|
EXPOSE 8081 8082
|
||||||
ENTRYPOINT ["java", "-jar", "/app.jar"]
|
ENTRYPOINT ["java", "-jar", "/app.jar"]
|
||||||
|
|||||||
@ -5,6 +5,7 @@ dependencies {
|
|||||||
|
|
||||||
implementation 'org.springframework.boot:spring-boot-starter-web'
|
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||||
implementation 'org.springframework.boot:spring-boot-starter-validation'
|
implementation 'org.springframework.boot:spring-boot-starter-validation'
|
||||||
|
implementation 'org.springframework.boot:spring-boot-starter-actuator'
|
||||||
implementation 'org.apache.httpcomponents.client5:httpclient5'
|
implementation 'org.apache.httpcomponents.client5:httpclient5'
|
||||||
|
|
||||||
compileOnly 'org.projectlombok:lombok'
|
compileOnly 'org.projectlombok:lombok'
|
||||||
|
|||||||
@ -3,7 +3,8 @@ services:
|
|||||||
image: gitea.hithomelabs.com/hithomelabs/portainer-automation:${ENV:-test}
|
image: gitea.hithomelabs.com/hithomelabs/portainer-automation:${ENV:-test}
|
||||||
container_name: portainer-automation_${ENV:-test}
|
container_name: portainer-automation_${ENV:-test}
|
||||||
ports:
|
ports:
|
||||||
- "${HOST_PORT:-8081}:8081"
|
- "${HOST_PORT:-8081}:8081" # Application port (internal service)
|
||||||
|
- "${MGMT_PORT:-5005}:8082" # Health management port (LAN only)
|
||||||
environment:
|
environment:
|
||||||
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE:-local}
|
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE:-local}
|
||||||
- PORTAINER_API_KEY=${PORTAINER_API_KEY}
|
- PORTAINER_API_KEY=${PORTAINER_API_KEY}
|
||||||
|
|||||||
@ -22,12 +22,11 @@ import java.security.cert.X509Certificate;
|
|||||||
public class PortainerClientConfig {
|
public class PortainerClientConfig {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Trust-all SSL RestTemplate for the "local" profile.
|
* Builds a RestTemplate that trusts all SSL certificates.
|
||||||
* Used when connecting via Cloudflare Tunnel (self-signed certs).
|
* Used when connecting via Cloudflare Tunnel (self-signed certs)
|
||||||
|
* or to the prod Portainer instance (also self-signed).
|
||||||
*/
|
*/
|
||||||
@Profile("local")
|
private static RestTemplate buildTrustAllRestTemplate() throws Exception {
|
||||||
@Bean(name = "portainerRestTemplate")
|
|
||||||
public RestTemplate portainerRestTemplateLocal() throws Exception {
|
|
||||||
TrustManager[] trustAllCerts = new TrustManager[]{
|
TrustManager[] trustAllCerts = new TrustManager[]{
|
||||||
new X509TrustManager() {
|
new X509TrustManager() {
|
||||||
public X509Certificate[] getAcceptedIssuers() { return new X509Certificate[0]; }
|
public X509Certificate[] getAcceptedIssuers() { return new X509Certificate[0]; }
|
||||||
@ -47,12 +46,32 @@ public class PortainerClientConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Standard validating SSL RestTemplate for non-local profiles
|
* Trust-all SSL RestTemplate for the "local" profile.
|
||||||
* (CI, test, prod — internal Docker network).
|
* Used when connecting via Cloudflare Tunnel (self-signed certs).
|
||||||
*/
|
*/
|
||||||
@Profile("!local")
|
@Profile("local")
|
||||||
@Bean(name = "portainerRestTemplate")
|
@Bean(name = "portainerRestTemplate")
|
||||||
public RestTemplate portainerRestTemplate() {
|
public RestTemplate portainerRestTemplateLocal() throws Exception {
|
||||||
|
return buildTrustAllRestTemplate();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Trust-all SSL RestTemplate for the "prod" profile.
|
||||||
|
* Prod Portainer at https://192.168.0.100:9443 uses a self-signed certificate.
|
||||||
|
*/
|
||||||
|
@Profile("prod")
|
||||||
|
@Bean(name = "portainerRestTemplate")
|
||||||
|
public RestTemplate portainerRestTemplateProd() throws Exception {
|
||||||
|
return buildTrustAllRestTemplate();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Standard validating SSL RestTemplate for profiles other than local and prod
|
||||||
|
* (CI, test — internal Docker network with valid certs).
|
||||||
|
*/
|
||||||
|
@Profile("!local & !prod")
|
||||||
|
@Bean(name = "portainerRestTemplate")
|
||||||
|
public RestTemplate portainerRestTemplateDefault() {
|
||||||
return new RestTemplate();
|
return new RestTemplate();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -3,3 +3,9 @@ portainer.base-url=https://192.168.0.100:9442
|
|||||||
portainer.api-key=${PORTAINER_API_KEY:}
|
portainer.api-key=${PORTAINER_API_KEY:}
|
||||||
portainer.endpoint-id=1
|
portainer.endpoint-id=1
|
||||||
portainer.service.api-key=${PORTAINER_SERVICE_API_KEY:change-me}
|
portainer.service.api-key=${PORTAINER_SERVICE_API_KEY:change-me}
|
||||||
|
|
||||||
|
# Actuator configuration - management port and exposed endpoints
|
||||||
|
# App runs on server.port=8081, so management port must differ (8082)
|
||||||
|
management.server.port=8082
|
||||||
|
management.endpoints.web.exposure.include=health,info
|
||||||
|
management.endpoint.health.show-details=when-authorized
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user