diff --git a/Dockerfile-online b/Dockerfile-online index 9e99459f..5a3d240e 100644 --- a/Dockerfile-online +++ b/Dockerfile-online @@ -1,5 +1,5 @@ -FROM java:openjdk-8-jre-alpine - +#FROM java:openjdk-8-jre-alpine +FROM openjdk:8-jre-alpine WORKDIR /home COPY target/*.jar /home diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 2ca69e7f..33fe2451 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -14,8 +14,8 @@ pipeline { GITHUB_CREDENTIAL_ID = 'github-id' KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig' REGISTRY = 'docker.io' - DOCKERHUB_NAMESPACE = 'docker_username' - GITHUB_ACCOUNT = 'kubesphere' + DOCKERHUB_NAMESPACE = 'scarlet' + GITHUB_ACCOUNT = 'ylsb' APP_NAME = 'devops-java-sample' } @@ -33,7 +33,18 @@ pipeline { } } } - + stage ('install podman') { + steps { + container ('maven') { + sh ''' + #curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:stable.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_7/devel:kubic:libcontainers:stable.repo + #yum -y install podman + #mv /usr/bin/docker /usr/bin/docker_ce + ln -s /usr/bin/podman /usr/bin/docker + ''' + } + } + } stage ('build & push') { steps { container ('maven') { @@ -96,7 +107,15 @@ pipeline { } steps { input(id: 'deploy-to-production', message: 'deploy to production?') - kubernetesDeploy(configs: 'deploy/prod-ol/**', enableConfigSubstitution: true, kubeconfigId: "$KUBECONFIG_CREDENTIAL_ID") + container ('maven') { + withCredentials([ + kubeconfigFile( + credentialsId: env.KUBECONFIG_CREDENTIAL_ID, + variable: 'KUBECONFIG') + ]) { + sh 'envsubst < deploy/dev-ol/devops-sample.yaml | kubectl apply -f -' + } + } } } } diff --git a/deploy/dev-ol/devops-sample-svc.yaml b/deploy/dev-ol/devops-sample-svc.yaml index 24fff6f3..930a705a 100644 --- a/deploy/dev-ol/devops-sample-svc.yaml +++ b/deploy/dev-ol/devops-sample-svc.yaml @@ -5,17 +5,17 @@ metadata: app: kubesphere component: ks-sample-dev name: ks-sample-dev - namespace: kubesphere-sample-dev + namespace: kubesphere-devops-worker spec: ports: - name: http port: 8080 protocol: TCP targetPort: 8080 - nodePort: 30861 + nodePort: 30880 selector: app: kubesphere component: ks-sample-dev tier: backend sessionAffinity: None - type: NodePort \ No newline at end of file + type: NodePort diff --git a/deploy/dev-ol/devops-sample.yaml b/deploy/dev-ol/devops-sample.yaml index e0a259a4..f75b02bb 100644 --- a/deploy/dev-ol/devops-sample.yaml +++ b/deploy/dev-ol/devops-sample.yaml @@ -6,7 +6,7 @@ metadata: component: ks-sample-dev tier: backend name: ks-sample-dev - namespace: kubesphere-sample-dev + namespace: kubesphere-devops-worker spec: progressDeadlineSeconds: 600 replicas: 1