Correct the DNS-Lookup for the guest-host (leaving DNS-Space of docker compose network)

Remove Sonar ... in Future-Releases it will be optional

Author: Springjunky

.gitignore

@@ -1 +1,4 @@
 docker-compose.yml
+docker-compose.yml-*
+*.jpi
+*.war

README.md

@@ -1,8 +1,8 @@
 ## docker-local-build-environment
 
-##### Tired of endless installation and configuration .... ?! 
+##### Tired of endless installation and configuration .... ?!
 
-My personal solution is a local Build Environment with Jenkins, Gitlab, Sonar and Nexus; ready in a few minutes.
+My personal solution is a local Build Environment with Jenkins, Gitlab, (Sonar) and Nexus; ready in a few minutes.
 Your own lokal, personal, continous build enviroment (maybe in future releases I just call it lpcbe).
 
 ### System requirements
@@ -15,23 +15,25 @@ Bring up your own build environment ... just do a
 ```
    git clone https://github.com/Springjunky/docker-local-build-environment.git
    cd docker-local-build-environment
-   sudo ./prepareCompose.sh 
+   sudo ./prepareCompose.sh
    docker-compose up --build -d
-   docker-compose logs 
+   docker-compose logs
 ```
 ### The first startup takes a long time (especially gitlab), so be patient
 
-open your favorite browser (_not_ at localhost, use the $(hostname)/jenkins ) 
+open your favorite browser (_not_ at localhost, use the $(hostname)/jenkins )
 to prevent jenkins spit out "your reverse proxy is wrong")
 
 ### Ready !
 
 Now you are ready to go with a little CI/CD Environment:
 ```
  Jenkins  http://<your-host-name>/jenkins
- Sonar  http://<your-host-name>/sonar
  Nexus  http://<your-host-name>/nexus
  Gitlab  http://<your-host-name>/gitlab
+ in the next Release:  Sonar  http://<your-host-name>/sonar
+
+
 ```
 #### Security
 ... not really, its all http .. don't worry about it! It's only local communication
@@ -65,11 +67,11 @@ iptables -N EXTERNAL-ACCESS-DENY
 iptables -A EXTERNAL-ACCESS-DENY -j LOG --log-prefix "DCKR-EXT-ACCESS-DENY:" --log-level 6
 iptables -A EXTERNAL-ACCESS-DENY -j DROP
 
-# Block all incomming traffic for docker 
+# Block all incomming traffic for docker
 iptables -A DOCKER-USER -i $EXTERNAL_INTERFACE \
          -p tcp --match multiport \
          --dports $PORTS_TO_BLOCK \
-         -j EXTERNAL-ACCESS-DENY 
+         -j EXTERNAL-ACCESS-DENY
 
 # Restore default rule to return all the rest back to the FORWARD-Chain
 iptables -A DOCKER-USER -j RETURN
@@ -100,11 +102,11 @@ echo "See logs with prefix DCKR-EXT-ACCESS-DENY:"
 
 ###  Giltab
 
-* the docker-registry is at port 5555 (and secured with an openssl certificate ..thats part of 
-  prepareCompose.sh), just create a project in gitlab and click at the  registry tab to show 
+* the docker-registry is at port 5555 (and secured with an openssl certificate ..thats part of
+  prepareCompose.sh), just create a project in gitlab and click at the  registry tab to show
   how to login to the project registry and how to tag your images
 * ssh cloning and pushing is at port 2222
- 
+
 #### gitlab-runner
 The runner is a gitlab-multirunner image with a docker-runner (concurrent=1) , based on [gitlab/gitlab-runner][2]  The docker-compose section has an environment called
 REGISTER_MODE, it can set to KEEP or REFRESH
@@ -120,7 +122,7 @@ It takes a long time until gitlab is ready to accept a runner registration, if i
 Gitlab is very very fast with new releases and sometimes the api has breaking changes. If something does not work take a look at the Jenkins Bugtracker.
 
 ### Sonar
-You need to install some rules (Administration - System - Update Center - Available - Search: Java)
+In future releases Sonar will be added...(You need to install some rules (Administration - System - Update Center - Available - Search: Java)
 
 ### Nexus
 Some ToDo for me described here
@@ -132,23 +134,27 @@ And _yes_ docker-plugin in jenkins works (docker in docker, usefull but not reco
 
 ## Troubleshooting
 
-In most cases a wrong DNS-Server causes trouble, to check this try the follwing.
+In most cases a wrong HOSTNAME:HOSTIP causes trouble, to check this try the follwing.
 * log into the sonarcube container (with id)
 ```
   docker container ls
-  docker container exec -it <your id> bash
+  docker container exec -it dockerlocalbuildenvironment_jenkins-fat_1 bash
+  apt-get update
+  apt-get install -y --allow-unauthenticated iputils-ping
   ping google.de
   ping jenkins-fat
+  ping gitlab
+  ping <your local hostname>
 ```
-both ping must be work
+every ping must work, if not, check extra_hosts in compose-file
 
 * consider low memory:
   with an amount lower than 8GB sonar and eleastic search did not startup
 
 * too many plugins to download:
   You can do an "pre download of the plugins", see the readme.md at jenkins-fat direcory
 
-  
+Docker-Networing insider docker-compose causes the parameter    
 
 ### My next steps
 
@@ -157,6 +163,7 @@ both ping must be work
 * ~~install docker-compose~~
 * ~~install ansible~~
 * ~~apply a gitlab runner~~
+* apply sonar
 * apply git-lfs
 
 

docker-compose-sonar-part.yml.template

@@ -0,0 +1,26 @@
+  sonar-db:
+    image: postgres
+    environment:
+      - POSTGRES_USER=sonar
+      - POSTGRES_PASSWORD=sonar
+    volumes:
+      - BASE_DATA_DIR/sonar-db/postgresql:/var/lib/postgresql
+      # This needs explicit mapping due to
+      # https://github.com/docker-library/postgres/blob/4e48e3228a30763913ece952c611e5e9b95c8759/Dockerfile.template#L52
+      - BASE_DATA_DIR/sonar-db/postgresql_data:/var/lib/postgresql/data
+    networks:
+       - devstacknetwork
+  sonar:
+    image: sonarqube
+    extra_hosts:
+      - HOSTNAME:HOSTIP
+
+    networks:
+       - devstacknetwork
+    environment:
+      - SONARQUBE_JDBC_URL=jdbc:postgresql://sonar-db:5432/sonar
+    volumes:
+      - BASE_DATA_DIR/sonar/sonarqube_conf:/opt/sonarqube/conf
+      - BASE_DATA_DIR/sonar/sonarqube_data:/opt/sonarqube/data
+      - BASE_DATA_DIR/sonar/sonarqube_extensions:/opt/sonarqube/extensions
+      - BASE_DATA_DIR/sonar/sonarqube_bundled-plugins:/opt/sonarqube/lib/bundled-plugins

docker-compose.yml.template

@@ -1,5 +1,5 @@
 #####################################
-# Don't touch this file is generated 
+# Don't touch this file is generated
 # expecilly for: HOSTNAME
 ###################################
 #
@@ -11,51 +11,34 @@ networks:
   devstacknetwork:
     driver: bridge
 
-services: 
+services:
+# ------------------------------------------------------------------------------
   ngnix:
      build: nginx-reverse
-     ports: 
-       - "80:80"       #http:// 
+     ports:
+       - "80:80"       #http://
        # SSH Bypassing into gitlab, if you want to change this edit nginx.conf also
        - "2222:2222"   #ssh port of gitlab (ssh://git@myhostname:2222/scott/foo.git)
        - "5555:5555"   #Gitlab Docker Registry do NOT use 5000, this is an internal PORT of the gitlab-ce Image
      networks:
        - devstacknetwork
+
+# ------------------------------------------------------------------------------
   jenkins-fat:
     build: jenkins-fat
-    dns: DNS_SERVER
+    extra_hosts:
+      - HOSTNAME:HOSTIP
     networks:
       - devstacknetwork
     volumes:
-      - BASE_DATA_DIR/jenkins:/var/jenkins_home 
+      - BASE_DATA_DIR/jenkins:/var/jenkins_home
       - /var/run/docker.sock:/var/run/docker.sock
-  sonar-db:
-    image: postgres
-    environment:
-      - POSTGRES_USER=sonar
-      - POSTGRES_PASSWORD=sonar
-    volumes:
-      - BASE_DATA_DIR/sonar-db/postgresql:/var/lib/postgresql
-      # This needs explicit mapping due to 
-      # https://github.com/docker-library/postgres/blob/4e48e3228a30763913ece952c611e5e9b95c8759/Dockerfile.template#L52
-      - BASE_DATA_DIR/sonar-db/postgresql_data:/var/lib/postgresql/data
-    networks:
-       - devstacknetwork
-  sonar:
-    image: sonarqube
-    dns: DNS_SERVER
-    networks:
-       - devstacknetwork
-    environment:
-      - SONARQUBE_JDBC_URL=jdbc:postgresql://sonar-db:5432/sonar
-    volumes:
-      - BASE_DATA_DIR/sonar/sonarqube_conf:/opt/sonarqube/conf
-      - BASE_DATA_DIR/sonar/sonarqube_data:/opt/sonarqube/data
-      - BASE_DATA_DIR/sonar/sonarqube_extensions:/opt/sonarqube/extensions
-      - BASE_DATA_DIR/sonar/sonarqube_bundled-plugins:/opt/sonarqube/lib/bundled-plugins
+
+# ------------------------------------------------------------------------------
   gitlab:
     image: 'gitlab/gitlab-ce:latest'
-    dns: DNS_SERVER
+    extra_hosts:
+      - HOSTNAME:HOSTIP
     networks:
       - devstacknetwork
     environment:
@@ -79,29 +62,29 @@ services:
       - BASE_DATA_DIR/gitlab/config:/etc/gitlab
       - BASE_DATA_DIR/gitlab/logs:/var/log/gitlab
       - BASE_DATA_DIR/gitlab/data:/var/opt/gitlab
-  
+# ------------------------------------------------------------------------------
+  nexus:
+    image: sonatype/nexus3
+    extra_hosts:
+      - HOSTNAME:HOSTIP
+    networks:
+      - devstacknetwork
+    environment:
+      - NEXUS_CONTEXT=nexus
+    volumes:
+      - BASE_DATA_DIR/nexus:/nexus-data
+
+# ------------------------------------------------------------------------------
   gitlabrunner:
     build: gitlabrunner
-    dns: DNS_SERVER
-    networks:
-       - devstacknetwork
+    network_mode: "host"
+    extra_hosts:
+      - HOSTNAME:HOSTIP
     environment:
-      - DOCKER_DNS=DNS_SERVER
       - GITLAB_URL=http://HOSTNAME/gitlab
       - REGISTER_TOKEN=s3cretToken4Runner
       - REGISTER_MODE=FRESH #KEEP register a new runner an keep it. FRESH unregister all runners and always install a new (pipeline-history lost!)
       - REGISTER_TRYS=60 # every 10 seconds a try to register the runner..gitlab takes a long time to startup
     volumes:
       - BASE_DATA_DIR/gitlab-runner/config:/etc/gitlab-runner
       - /var/run/docker.sock:/var/run/docker.sock
-  nexus:
-    image: sonatype/nexus3
-    dns: DNS_SERVER
-    networks:
-       - devstacknetwork
-    environment:
-      - NEXUS_CONTEXT=nexus
-    volumes:
-      - BASE_DATA_DIR/nexus:/nexus-data   
-      
-  

gitlabrunner/entrypointAutoregister

@@ -38,7 +38,8 @@ if test $REGISTER_MODE = "FRESH" -o  $RUNNER_IS_PRESENT -ne 0 ; then
       gitlab-runner register -n --url=${GITLAB_URL} --registration-token=${REGISTER_TOKEN} \
       --executor=docker --name=docker-multi-runner \
       --run-untagged=true --locked=false --docker-image=docker:latest \
-      --docker-privileged 
+      --docker-privileged \
+      --docker-extra-hosts="jarvis:192.168.34.98"
       REGISTERED=$?
       if [ $REGISTERED -ne 0 ] ; then
         echo "${GITLAB_URL} not ready $TRYS trys left, next try in 10 second for ${GITLAB_URL}"  
@@ -52,9 +53,10 @@ if test $REGISTER_MODE = "FRESH" -o  $RUNNER_IS_PRESENT -ne 0 ; then
         gitlab-runner verify --delete
         sleep 1
         gitlab-runner register -n --url=${GITLAB_URL} --registration-token=${REGISTER_TOKEN} \
-        --executor=docker --name=docker--multi-runner \
+        --executor=docker --name=docker-multi-runner \
         --run-untagged=true --locked=false --docker-image=docker:latest \
-        --docker-privileged 
+        --docker-privileged \
+        --docker-extra-hosts="jarvis:192.168.34.98"
       fi
    done  
 fi

jenkins-fat/Dockerfile

@@ -93,25 +93,25 @@ COPY init.groovy /usr/share/jenkins/ref/init.groovy.d/tcp-slave-agent-port.groov
 # jenkins version being bundled in this docker image 
 # This is the latest stable version
 ARG JENKINS_VERSION
-ENV JENKINS_VERSION ${JENKINS_VERSION:-2.73.2}
+ENV JENKINS_VERSION ${JENKINS_VERSION:-2.89.2}
 
 #### jenkins.war checksum, download will be validated using it
-ARG JENKINS_SHA=1489e498f682e8b61ce4cf8124de200f264b087c
+ARG JENKINS_SHA=cf7be0af90e310a3232bcf1d6c80902788d5ebae
 
 ARG JENKINS_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/${JENKINS_VERSION}/jenkins-war-${JENKINS_VERSION}.war
 
 # could use ADD but this one does not check Last-Modified header neither does it allow to control checksum 
 # see https://github.com/docker/docker/issues/8331
-RUN curl -fsSL ${JENKINS_URL} -o /usr/share/jenkins/jenkins.war && echo "${JENKINS_SHA}  /usr/share/jenkins/jenkins.war" | sha1sum -c -
+# RUN curl -fsSL ${JENKINS_URL} -o /usr/share/jenkins/jenkins.war && echo "${JENKINS_SHA}  /usr/share/jenkins/jenkins.war" | sha1sum -c -
 
 #------------------ Optional lokal caching of files
 # Download jenkins with yout favorite browser and put the war in the current dir. 
-#COPY jenkins-war-2.73.2.war /usr/share/jenkins/jenkins.war
+COPY jenkins-war-2.89.2.war /usr/share/jenkins/jenkins.war
 ###### # Copy all Cached plugins ...
 # to preLoad all Plugins listed in active-plugins.txt use the command
 #  ./preDownload.sh $(cat active-plugins.txt)
 # this will download all the plugins in th Folder Plugins
-# COPY Plugins/* /usr/share/jenkins/ref/plugins/
+COPY Plugins/* /usr/share/jenkins/ref/plugins/
 #------------------ Optional lokal caching of files end block
 
 ENV JENKINS_UC https://updates.jenkins.io

jenkins-fat/active-plugins.txt

@@ -1,5 +1,5 @@
-ace-editor
 analysis-collector
+ace-editor
 analysis-core
 ansible
 ansicolor
@@ -77,11 +77,9 @@ jquery-ui
 jsch
 junit
 lastfailureversioncolumn
-lastsuccessdescriptioncolumn
 lastsuccessversioncolumn
 ldap
 m2release
-m2-repo-reaper
 mailer
 mapdb-api
 matrix-auth

jenkins-fat/preDownload.sh

@@ -4,7 +4,7 @@ do
   then
     echo "Already downloaded ${datei} "
   else
-    wget -P Plugins https://updates.jenkins.io/2.73/latest/${datei}.hpi
+    wget -P Plugins https://updates.jenkins.io/2.89/latest/${datei}.hpi
     mv Plugins/${datei}.hpi Plugins/${datei}.jpi
   echo
   fi