Index: Jenkinsfile =================================================================== diff -u -r32b2c7e40b684ee1704765eb5d4bc42711cba2be -r934bd6b0aa2d375e533c263841ffde05db21692d --- Jenkinsfile (.../Jenkinsfile) (revision 32b2c7e40b684ee1704765eb5d4bc42711cba2be) +++ Jenkinsfile (.../Jenkinsfile) (revision 934bd6b0aa2d375e533c263841ffde05db21692d) @@ -24,49 +24,51 @@ agent any steps { withCredentials([gitUsernamePassword(credentialsId: 'jenkins-gitea-creds')]) { - sh "cd app; env; ${COMPBIN} i " - sh 'cd app; find . -name build | xargs chmod 755' - sh "cd app; node build-all.js" - sh "cd app; tar zcf ../repnetweb-app.tgz *" - sh "cd config; tar zcf ../repnetweb-app-config.tgz *" + sh "cd app; env; ${COMPBIN} i " + sh 'cd app; find . -name build | xargs chmod 755' + sh "cd app; node build-all.js" + sh "cd app; tar zcf ../repnetweb-app.tgz *" + sh "cd config; tar zcf ../repnetweb-app-config.tgz *" } } post { success { - archiveArtifacts(artifacts: "repnetweb-app.tgz,repnetweb-app-config.tgz", fingerprint: true, onlyIfSuccessful: true) + archiveArtifacts(artifacts: "repnetweb-app.tgz,repnetweb-app-config.tgz", fingerprint: true, onlyIfSuccessful: true) } } } stage ('Retrieve config files') { agent any steps { script { - dir("DockerfileConfigs") { - checkout([$class: 'GitSCM', branches: [[name: '*/master']], extensions: [[$class: 'GitLFSPull']], userRemoteConfigs: [[credentialsId: 'jenkins-gitea-creds', url: 'https://git.lemanscorp.com/OpsAppDev/DockerfileConfigs2.git/']]]) + dir("DockerfileConfigs") { + checkout([$class: 'GitSCM', branches: [[name: '*/master']], extensions: [[$class: 'GitLFSPull']], userRemoteConfigs: [[credentialsId: 'jenkins-gitea-creds', url: 'https://git.lemanscorp.com/OpsAppDev/DockerfileConfigs2.git/']]]) + } } - } } } stage ('Build Repnetweb') { - agent any - environment { + agent any + environment { DOCKER_BUILDKIT = 1 - } - steps { - script { - sh "cp -R ${env.WORKSPACE}/DockerfileConfigs/repnetweb ${env.WORKSPACE}/dockerbuild/repnetweb/configs/" - docker.withRegistry("https://workhorse.lemanscorp.com:8443","lemansdocker") { - def repnetwebImage = docker.build("repnetweb", "--build-arg workspace=${env.WORKSPACE} ./dockerbuild/repnetweb") - repnetwebImage.push("${env.BUILD_NUMBER}") - repnetwebImage.push("latest") - sh "docker rmi --force \$(docker images -q ${repnetwebImage.id} | uniq)" - } + } + steps { + script { + sh "cp -R ${env.WORKSPACE}/DockerfileConfigs/repnetweb ${env.WORKSPACE}/dockerbuild/repnetweb/configs/" + sh "mv repnetweb-app.tgz dockerbuild/repnetweb" + sh "mv repnetweb-app-config.tgz dockerbuild/repnetweb" + docker.withRegistry("https://workhorse.lemanscorp.com:8443","lemansdocker") { + def repnetwebImage = docker.build("repnetweb", "--build-arg workspace=${env.WORKSPACE} ./dockerbuild/repnetweb") + repnetwebImage.push("${env.BUILD_NUMBER}") + repnetwebImage.push("latest") + sh "docker rmi --force \$(docker images -q ${repnetwebImage.id} | uniq)" + } } } - post { - success { - cleanWs() - } + post { + success { + cleanWs() + } } } } Index: dockerbuild/repnetweb/Dockerfile =================================================================== diff -u -r97e217ae9e608e60e705a62cab77fbbae5ffed19 -r934bd6b0aa2d375e533c263841ffde05db21692d --- dockerbuild/repnetweb/Dockerfile (.../Dockerfile) (revision 97e217ae9e608e60e705a62cab77fbbae5ffed19) +++ dockerbuild/repnetweb/Dockerfile (.../Dockerfile) (revision 934bd6b0aa2d375e533c263841ffde05db21692d) @@ -21,10 +21,15 @@ a2enmod alias auth_basic authn_file authnz_ldap authz_groupfile authz_host authz_user autoindex cgi deflate env expires filter headers ldap mime negotiation php7.2 proxy proxy_ajp proxy_http reqtimeout rewrite setenvif status substitute unique_id COPY /configs/repnetweb/a-configs-repnetweb/apache2.conf /etc/apache2/apache2.conf COPY /configs/apache-prod.conf /etc/apache2/sites-enabled/000-default.conf -COPY /repnetweb-current.tgz /tmp/ -RUN mkdir /var/www/repnetweb-app && mkdir -p /var/www/repnetweb-app/current && cd /var/www/repnetweb-app/current; tar -zxf /tmp/repnetweb-current.tgz -RUN mkdir /var/log/php && \ +COPY /repnetweb-app.tgz /tmp/ +RUN mkdir -p /var/www/repnetweb-app/ && cd /var/www/repnetweb-app; tar -zxf /tmp/repnetweb-app.tgz +COPY /repnetweb-app-config.tgz /tmp/ +RUN mkdir /var/www/configs/ && mkdir -p /var/www/configs/repnetweb && cd /var/www/configs/repnetweb; && tar -zxf /tmp/repnetweb-app-config.tgz && \ + mkdir /var/log/php && \ chown www-data. /var/log/php && \ + touch /var/log/php_errors.log && \ + chown www-data. /var/log/php_errors.log && \ + echo "error_log = /var/log/php_errors.log" >> /etc/php/7.0/apache2/php.ini && \ echo "#!/bin/bash" > /root/startup && \ echo "/etc/init.d/ssh start" >> /root/startup && \ echo "killall -9 apache2" >> /root/startup && \