build improvements
This commit is contained in:
@@ -26,6 +26,11 @@ services:
|
||||
ports:
|
||||
- "4012:5432"
|
||||
|
||||
yogamail:
|
||||
image: dockage/mailcatcher:0.9.0
|
||||
ports:
|
||||
- "4013:1080"
|
||||
- "4014:1025"
|
||||
|
||||
volumes:
|
||||
next-db: {}
|
||||
|
||||
@@ -1 +1 @@
|
||||
202501081712.9d7bb39
|
||||
202502042213.4d239f7
|
||||
|
||||
@@ -9,4 +9,4 @@ echo "build image ${TAG} from folder ${PROJECT_ROOT}"
|
||||
|
||||
cd $PROJECT_ROOT
|
||||
|
||||
docker build --platform linux/amd64 -t $TAG .
|
||||
docker build -t $TAG .
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
ENV_DEV_DIR=$(readlink -f "${CURRENT_DIR}/../../../environments/dev/docker-compose")
|
||||
COMPOSE_FILE=$(readlink -f "/docker-compose.yml")
|
||||
@@ -1,8 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
CURRENT_DIR=$(dirname "$0")
|
||||
source "${CURRENT_DIR}/start.docker.compose.env.sh"
|
||||
|
||||
cd "${ENV_DEV_DIR}"
|
||||
echo "starting compose file in ${ENV_DEV_DIR}"
|
||||
docker compose up -d
|
||||
@@ -1,18 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
CURRENT_DIR=$(dirname "$0")
|
||||
source "${CURRENT_DIR}/build.docker.env.sh"
|
||||
source "${CURRENT_DIR}/start.docker.compose.env.sh"
|
||||
echo "updating image version to ${VERSION} in compose file ${COMPOSE_FILE}"
|
||||
#export TAG=docker.rschneider.hu/infra/yogastic:$VERSION
|
||||
|
||||
case $(uname) in
|
||||
"Darwin")
|
||||
echo "Detected macOS"
|
||||
sed -i'' -e "s/docker.rschneider.hu\\/infra\\/yogastic:.*/docker.rschneider.hu\\/infra\\/yogastic:$VERSION/g" $COMPOSE_FILE
|
||||
;;
|
||||
*)
|
||||
sed -i "s/docker.rschneider.hu\\/infra\\/yogastic:.*/docker.rschneider.hu\\/infra\\/yogastic:$VERSION/g" $COMPOSE_FILE
|
||||
#sed -i "s/docker.rschneider.hu\\/infra\\/yogastic:.*/docker.rschneider.hu\\/infra\\/yogastic:$VERSION/g" $COMPOSE_FILE
|
||||
;;
|
||||
esac
|
||||
@@ -1,10 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
|
||||
CURRENT_DIR=$(dirname "$0")
|
||||
source "${CURRENT_DIR}/build.docker.env.sh"
|
||||
source "${CURRENT_DIR}/start.docker.compose.env.sh"
|
||||
|
||||
cd ${ENV_DEV_DIR}
|
||||
echo "Destroy compose in ${ENV_DEV_DIR}"
|
||||
docker compose down -v
|
||||
@@ -1,10 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
|
||||
CURRENT_DIR=$(dirname "$0")
|
||||
source "${CURRENT_DIR}/build.docker.env.sh"
|
||||
source "${CURRENT_DIR}/start.docker.compose.env.sh"
|
||||
|
||||
cd ${ENV_DEV_DIR}
|
||||
echo "Stopping compose in ${ENV_DEV_DIR}"
|
||||
docker compose down
|
||||
@@ -1 +1 @@
|
||||
202501071722.a8b144f
|
||||
202502042213.4d239f7
|
||||
|
||||
49
environment/infra/jenkins/build.cms.image.Jenkinsfile
Normal file
49
environment/infra/jenkins/build.cms.image.Jenkinsfile
Normal file
@@ -0,0 +1,49 @@
|
||||
pipeline {
|
||||
agent any
|
||||
|
||||
environment {
|
||||
DOCKER_IMAGE = 'yoga-cms'
|
||||
DOCKER_REGISTRY = 'your-docker-registry'
|
||||
DOCKER_CREDENTIALS_ID = 'your-docker-credentials-id'
|
||||
}
|
||||
|
||||
stages {
|
||||
stage('Checkout') {
|
||||
steps {
|
||||
checkout([$class: 'GitSCM', branches: [[name: '*/main']], userRemoteConfigs: [[url: 'https://gitea.rschneider.hu/rschneider/yogastic.git', credentialsId: 'rschneider_gitea.rschneider.hu']]])
|
||||
}
|
||||
}
|
||||
|
||||
stage('Build Docker Image') {
|
||||
steps {
|
||||
script {
|
||||
// docker.build("${DOCKER_IMAGE}:${env.BUILD_ID}")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Push Docker Image') {
|
||||
steps {
|
||||
script {
|
||||
// docker.withRegistry("https://${DOCKER_REGISTRY}", DOCKER_CREDENTIALS_ID) {
|
||||
// docker.image("${DOCKER_IMAGE}:${env.BUILD_ID}").push()
|
||||
// }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Cleanup') {
|
||||
steps {
|
||||
script {
|
||||
docker.image("${DOCKER_IMAGE}:${env.BUILD_ID}").remove()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
post {
|
||||
always {
|
||||
cleanWs()
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user