diff --git a/Jenkinsfile b/Jenkinsfile index 27b54f6..2e09cfd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,6 +12,7 @@ sh 'docker build --tag windows-build-agent ./ -f Dockerfile.build.windows' sh 'docker build --tag macosx-build-agent ./ -f Dockerfile.build.macosx' sh 'docker build --tag cockpit-ws ./ -f Dockerfile.cockpit' + sh 'docker pull portainer/portainer-ce:latest' } } stage('Deploy') { diff --git a/Jenkinsfile b/Jenkinsfile index 27b54f6..2e09cfd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,6 +12,7 @@ sh 'docker build --tag windows-build-agent ./ -f Dockerfile.build.windows' sh 'docker build --tag macosx-build-agent ./ -f Dockerfile.build.macosx' sh 'docker build --tag cockpit-ws ./ -f Dockerfile.cockpit' + sh 'docker pull portainer/portainer-ce:latest' } } stage('Deploy') { diff --git a/docker-compose.yml b/docker-compose.yml index 1d7c97e..baeede3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,6 @@ services: + cockpit-ws: image: cockpit-ws:latest container_name: cockpit-ws @@ -18,3 +19,15 @@ ports: - "9092:9092" + portainer: + image: portainer/portainer-ce:latest + container_name: portainer-ce + hostname: portainer.localdomain + volumes: + # Docker access + - /var/run/docker.sock:/var/run/docker.sock + restart: always + ports: + - "9000:9000" + +