diff --git a/Jenkinsfile-online b/Jenkinsfile-online index dec0cebff..f4cd731a7 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -14,13 +14,14 @@ pipeline { GITHUB_CREDENTIAL_ID = 'github-id' KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig' REGISTRY = 'docker.io' - DOCKERHUB_NAMESPACE = 'docker_username' - GITHUB_ACCOUNT = 'kubesphere' + DOCKERHUB_NAMESPACE = 'ileksiah' + GITHUB_ACCOUNT = 'ileksiah' APP_NAME = 'devops-java-sample' SONAR_CREDENTIAL_ID = 'sonar-token' } stages { +/* stage ('checkout scm') { steps { checkout(scm) @@ -49,20 +50,44 @@ pipeline { } } } - +*/ + stage ('build & push') { steps { + //input(id: 'deploy-to-dev', message: 'deploy to dev?') container ('maven') { + sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' + /* + sh 'whoami' + sh 'cat /etc/*-release' + sh 'ps -ef' + sh 'ls -al /var/run/' + sh 'ls -al /run/docker.sock' + sh 'ls -al /run' + sh 'ls -al /var/run' + + sh 'apt remove --purge containerd.io docker-ce docker-ce-cli' + sh 'wget https://download.docker.com/linux/debian/dists/stretch/pool/stable/amd64/docker-ce_18.06.1~ce~3-0~debian_amd64.deb' + sh 'dpkg -i docker-ce_18.06.1~ce~3-0~debian_amd64.deb' + + sh '/sbin/ifconfig' + sh 'docker version' + sh 'docker images' + */ + + /* tkg sh 'docker build -f Dockerfile-online -t $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER .' withCredentials([usernamePassword(passwordVariable : 'DOCKER_PASSWORD' ,usernameVariable : 'DOCKER_USERNAME' ,credentialsId : "$DOCKER_CREDENTIAL_ID" ,)]) { sh 'echo "$DOCKER_PASSWORD" | docker login $REGISTRY -u "$DOCKER_USERNAME" --password-stdin' sh 'docker push $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER' } + */ + } } } - +/* tkg stage('push latest'){ when{ branch 'master' @@ -74,7 +99,7 @@ pipeline { } } } - +*/ stage('deploy to dev') { when{ branch 'master' @@ -94,14 +119,20 @@ pipeline { container ('maven') { input(id: 'release-image-with-tag', message: 'release image with tag?') withCredentials([usernamePassword(credentialsId: "$GITHUB_CREDENTIAL_ID", passwordVariable: 'GIT_PASSWORD', usernameVariable: 'GIT_USERNAME')]) { - sh 'git config --global user.email "kubesphere@yunify.com" ' - sh 'git config --global user.name "kubesphere" ' + //sh 'git config --global user.email "kubesphere@yunify.com" ' + //sh 'git config --global user.name "kubesphere" ' + sh 'git config --global user.email "ileksiah@gmail.com" ' + sh 'git config --global user.name "ileksiah" ' sh 'git tag -a $TAG_NAME -m "$TAG_NAME" ' - sh 'git push http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git --tags --ipv4' + //sh 'git push \"http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git --tags --ipv4\"' + sh 'git push http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git --tags --ipv4' + //sh 'git push http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git HEAD:master' } - sh 'docker tag $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME ' - sh 'docker push $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME ' - } + /* tkg + sh 'docker tag $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME ' + sh 'docker push $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME ' + */ + } } } stage('deploy to production') { diff --git a/deploy/dev-ol/devops-sample.yaml b/deploy/dev-ol/devops-sample.yaml index e0a259a47..5dddaf32d 100644 --- a/deploy/dev-ol/devops-sample.yaml +++ b/deploy/dev-ol/devops-sample.yaml @@ -28,7 +28,8 @@ spec: value: js|html - name: CACHE_PUBLIC_EXPIRATION value: 3d - image: $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER + #image: $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER + image: ileksiah/devops-java-sample:SNAPSHOT-master-79 readinessProbe: httpGet: path: / diff --git a/deploy/prod-ol/devops-sample.yaml b/deploy/prod-ol/devops-sample.yaml index 4d93876a4..d6d0e7ddb 100644 --- a/deploy/prod-ol/devops-sample.yaml +++ b/deploy/prod-ol/devops-sample.yaml @@ -33,7 +33,8 @@ spec: value: js|html - name: CACHE_PUBLIC_EXPIRATION value: 3d - image: $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME + #image: $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME + image: ileksiah/devops-java-sample:v.0.0.2 readinessProbe: httpGet: path: / @@ -57,4 +58,4 @@ spec: terminationMessagePolicy: File dnsPolicy: ClusterFirst restartPolicy: Always - terminationGracePeriodSeconds: 30 \ No newline at end of file + terminationGracePeriodSeconds: 30