feat: update code

This commit is contained in:
Georg K
2025-06-19 04:37:54 +03:00
parent e14ae1bd1b
commit 00a1463461
9 changed files with 41 additions and 149 deletions

View File

@@ -1,10 +1,9 @@
variables:
CI_REGISTRY: registry.connectone.pro
CONTAINER_IMAGE: ${CI_REGISTRY}/${CI_PROJECT_PATH}:${CI_BUILD_REF_NAME}_${CI_BUILD_REF}
CONTAINER_IMAGE: ${CI_REGISTRY}/${CI_PROJECT_PATH}:${CI_COMMIT_REF_NAME}_${CI_COMMIT_SHORT_SHA}
stages:
- release
- deploy
- release-deb
- release-hosted
@@ -12,12 +11,12 @@ release:
stage: release
image: docker:latest
before_script:
- docker login -u gitlab-ci-token -p ${CI_BUILD_TOKEN} ${CI_REGISTRY}
- docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
script:
- docker build -t ${CONTAINER_IMAGE} .
- docker push ${CONTAINER_IMAGE}
when: manual
only:
- develop
- main
release-deb:
@@ -37,7 +36,7 @@ release-hosted:
stage: release-hosted
image: alpine:latest
variables:
VERSION: "1.0.1"
VERSION: "1.0.2"
script:
- apk add --no-cache curl
- chmod a+x hosted/install.sh
@@ -46,38 +45,3 @@ release-hosted:
when: manual
only:
- main
deploy-staging:
stage: deploy
image: jar3b/deploh:${STAGING_DEPLOYER_VERSION}
variables:
KUBECONFIG_BASE64: ${STAGING_KUBECONFIG}
KUBECONFIG_CONTEXT_NAME: ${STAGING_KUBECONFIG_CONTEXT}
NAMESPACE: ${STAGING_NAMESPACE}
MAIN_DOMAIN: ${STAGING_MAIN_DOMAIN}
STORAGE_BASE: ${STAGING_STORAGE_BASE}
script:
- he.sh . ${NAMESPACE} "freeradius" --set db.password=${PG_PROD_PASS}
environment:
name: staging
only:
- develop
deploy-production:
stage: deploy
image: jar3b/deploh:${PRODUCTION_DEPLOYER_VERSION}
variables:
KUBECONFIG_BASE64: ${PRODUCTION_KUBECONFIG}
KUBECONFIG_CONTEXT_NAME: ${PRODUCTION_KUBECONFIG_CONTEXT}
NAMESPACE: ${PRODUCTION_NAMESPACE}
MAIN_DOMAIN: ${PRODUCTION_MAIN_DOMAIN}
STORAGE_BASE: ${PRODUCTION_STORAGE_BASE}
script:
- he.sh . ${NAMESPACE} "freeradius" --set db.password=${PG_PROD_PASS}
environment:
name: production
when: manual
only:
- main