Merge pull request #683 from gothrek22/master

Update jenkins-ci to latest version.

templates/gogs/1/docker-compose.yml.tpl

@@ -0,0 +1,35 @@
+version: '2'
+services:
+  gogs:
+    image: gogs/gogs:0.11.34
+    volumes:
+      - gogs-data:/data
+{{- if ne .Values.db_link ""}}
+    external_links:
+      - ${db_link}:db
+{{- else}}
+    links:
+      - db:db
+  db:
+    image: mysql:8.0
+    environment:
+      MYSQL_ROOT_PASSWORD: ${mysql_password}
+      MYSQL_USER: ${mysql_user}
+      MYSQL_PASSWORD: ${mysql_password}
+      MYSQL_DATABASE: ${mysql_db}
+    volumes:
+      - gogs-db:/var/lib/mysql
+{{- end}}
+  lb:
+    image: rancher/lb-service-haproxy:v0.7.9
+    ports:
+    - ${http_port}:${http_port}/tcp
+    - ${ssh_port}:${ssh_port}/tcp
+volumes:
+  gogs-data:
+    driver: ${volume_driver}
+{{- if eq .Values.db_link ""}}
+  gogs-db:
+    driver: ${volume_driver}
+{{- end}}
+

templates/gogs/1/rancher-compose.yml

@@ -0,0 +1,94 @@
+version: '2'
+catalog:
+  name: "Gogs"
+  version: "v0.11.34"
+  description: "A painless self-hosted Git service"
+  uuid: gogs-0
+  minimum_rancher_version: v0.51.0
+  questions:
+    - variable: http_port
+      description: "http port to access gogs webui"
+      label: "Http Port"
+      required: true
+      default: "8080" 
+      type: "int"
+    - variable: ssh_port
+      description: "ssh port to access gogs cli"
+      label: "SSH Port"
+      required: true
+      default: "2222"
+      type: "int"
+    - variable: "volume_driver"
+      description: "Volume driver to associate with this service"
+      label: "Volume Driver"
+      required: true
+      default: "local"
+      type: enum
+      options: # List of options if using type of `enum`
+        - local
+        - rancher-nfs
+        - rancher-efs
+        - rancher-ebs
+    - variable: "db_link"
+      description: |
+        DB external service link cluster.
+      label: "External db service"
+      default: ""
+      required: false
+      type: "service"
+    - variable: mysql_db
+      description: "mysql db"
+      label: "Mysql db"
+      required: true
+      default: "gogs"
+      type: "string"
+    - variable: mysql_user
+      description: "mysql user"
+      label: "Mysql User"
+      required: true
+      default: "gogs"
+      type: "string"
+    - variable: mysql_password
+      description: "mysql root password"
+      label: "Mysql Password"
+      required: true
+      default: "default_pass"
+      type: "password"
+services:
+  gogs:
+    scale: 1
+    retain_ip: true
+    health_check:
+      response_timeout: 2000
+      healthy_threshold: 2
+      port: 3000
+      unhealthy_threshold: 3
+      initializing_timeout: 300000
+      interval: 2000
+      strategy: recreate
+      request_line: GET "/" "HTTP/1.0"
+      reinitializing_timeout: 120000
+  lb:
+    scale: 1
+    start_on_create: true
+    lb_config:
+      certs: []
+      port_rules:
+      - priority: 1
+        protocol: http
+        service: gogs
+        source_port: ${http_port}
+        target_port: 3000
+      - priority: 2
+        protocol: tcp
+        service: gogs
+        source_port: ${ssh_port}
+        target_port: 22
+    health_check:
+      response_timeout: 2000
+      healthy_threshold: 2
+      port: 42
+      unhealthy_threshold: 3
+      initializing_timeout: 60000
+      interval: 2000
+      reinitializing_timeout: 60000

templates/gogs/config.yml

@@ -1,5 +1,5 @@
 name: Gogs
 description: |
     A painless self-hosted Git service
-version: v0.11.19
+version: v0.11.34
 category: Git

templates/jenkins-ci/4/docker-compose.yml

@@ -0,0 +1,20 @@
+jenkins-primary:
+  image: "jenkins/jenkins:2.92"
+  ports:
+    - "${PORT}:8080"
+  labels:
+    io.rancher.sidekicks: jenkins-plugins,jenkins-datavolume
+    io.rancher.container.hostname_override: container_name
+  volumes_from:
+    - jenkins-plugins
+    - jenkins-datavolume
+  entrypoint: /usr/share/jenkins/rancher/jenkins.sh
+jenkins-plugins:
+  image: rancher/jenkins-plugins:v0.1.1
+jenkins-datavolume:
+  image: "busybox"
+  volumes:
+    - ${volume_work}:/var/jenkins_home
+  labels:
+    io.rancher.container.start_once: true
+  entrypoint: ["chown", "-R", "1000:1000", "/var/jenkins_home"]

templates/jenkins-ci/4/rancher-compose.yml

@@ -0,0 +1,42 @@
+.catalog:
+  name: Jenkins
+  version: 2.92-rancher1
+  description: |
+    Jenkins CI management server.
+  questions:
+  - variable: "PORT"
+    type: "int"
+    label: "Port Number"
+    description: "Which port should Jenkins listen on?"
+    default: 8080
+    required: true
+  - variable: "volume_work"
+    description: "Work volume to save jenkins data"
+    label: "Work volume:"
+    required: true
+    default: "/var/lib/docker/jenkins-ci"
+    type: "string"
+  - variable: "plugins"
+    type: "multiline"
+    label: "List of Plugins"
+    description: |
+      List of plugins in the format <plugin_name>[:<version>]
+      one entry per line.
+    default: |
+      credentials
+      git
+      git-client
+      github
+      github-api
+      github-oauth
+      greenballs
+      junit
+      plain-credentials
+      scm-api
+      ssh-credentials
+      ssh-slaves
+      swarm
+jenkins-primary:
+  metadata:
+    plugins: |
+      ${plugins}

templates/jenkins-ci/config.yml

@@ -1,5 +1,5 @@
 name: Jenkins
 description: |
   Jenkins CI server (LTS)
-version: 2.60.1-rancher1
+version: 2.92-rancher1
 category: Continuous Integration