diff --git a/Jenkinsfile b/Jenkinsfile index 1c62e24..8fa3f39 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,19 +16,38 @@ pipeline { DOCKER_HUB_CREDENTIALS = credentials('docker-hub-fah16145') } stages { - stage('Build') { - steps { - sh 'docker build -t fah16145/jenkins-with-docker:latest .' - } - } stage('Login') { steps { sh 'docker login -u ${DOCKER_HUB_CREDENTIALS_USR} -p ${DOCKER_HUB_CREDENTIALS_PSW}' } } - stage('Push') { - steps { - sh 'docker push fah16145/jenkins-with-docker:latest' + stage('Default Image') { + stages { + stage('Build') { + steps { + sh 'docker build -t fah16145/jenkins-with-docker:latest .' + } + } + stage('Push') { + steps { + sh 'docker push fah16145/jenkins-with-docker:latest' + } + } + } + } + stage('Alpine Image') { + stages { + stage('Build') { + steps { + sh 'cd alpine' + sh 'docker build -t fah16145/jenkins-with-docker:alpine .' + } + } + stage('Push') { + steps { + sh 'docker push fah16145/jenkins-with-docker:alpine' + } + } } } } diff --git a/alpine/Dockerfile b/alpine/Dockerfile index f00e0a4..45f8efa 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -6,5 +6,7 @@ RUN usermod -aG docker jenkins RUN apk add --no-cache docker docker-compose +COPY --chown=jenkins:jenkins executors.groovy /usr/share/jenkins/ref/init.groovy.d/executors.groovy + USER jenkins RUN jenkins-plugin-cli --plugins "blueocean docker-workflow"