From c0aaf2f5cbff1641a37f96d1d18c68420b0d84f5 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 24 Sep 2018 13:03:02 +0200 Subject: [PATCH] added docker image build step --- .dockerignore | 6 +-- Dockerfile | 28 ++++++-------- Jenkinsfile | 8 ++++ helm/.helmignore | 21 ----------- helm/Chart.yaml | 5 --- helm/templates/NOTES.txt | 19 ---------- helm/templates/_helpers.tpl | 32 ---------------- helm/templates/deployment.yaml | 69 ---------------------------------- helm/templates/ingress.yaml | 38 ------------------- helm/templates/pvc.yaml | 24 ------------ helm/templates/service.yaml | 19 ---------- helm/values.yaml | 67 --------------------------------- 12 files changed, 23 insertions(+), 313 deletions(-) delete mode 100644 helm/.helmignore delete mode 100644 helm/Chart.yaml delete mode 100644 helm/templates/NOTES.txt delete mode 100644 helm/templates/_helpers.tpl delete mode 100644 helm/templates/deployment.yaml delete mode 100644 helm/templates/ingress.yaml delete mode 100644 helm/templates/pvc.yaml delete mode 100644 helm/templates/service.yaml delete mode 100644 helm/values.yaml diff --git a/.dockerignore b/.dockerignore index d8c2ee7b5f..0609164d73 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,3 @@ -Dockerfile -.hg -helm +# ignore everything except scm-server.tar.gz +** +!scm-server/target/*.tar.gz diff --git a/Dockerfile b/Dockerfile index 3d95dc98df..781a3e890b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,24 +1,20 @@ -FROM maven:3.5.4-jdk-8 as builder -COPY . /usr/src +FROM openjdk:8u171-alpine3.8 -WORKDIR /usr/src -RUN mvn clean install +ENV SCM_HOME=/var/lib/scm -FROM openjdk:8u171-jdk-alpine3.8 - -ENV SCM_HOME /var/lib/scm - -COPY --from=builder /usr/src/scm-server/target/scm-server-app.tar.gz /opt/scm-server-app.tar.gz RUN set -x \ - && mkdir /var/lib/scm \ - && addgroup -g 1000 -S scm \ - && adduser -D -H -u 1000 -h /opt/scm-server -G scm scm \ - && tar xfz /opt/scm-server-app.tar.gz -C /opt \ - && chown -R scm:scm /opt/scm-server /var/lib/scm \ - && apk add --no-cache bash mercurial + && apk add --no-cache mercurial bash \ + && addgroup -S -g 1000 scm \ + && adduser -S -s /bin/false -G scm -h /opt/scm-server -D -H -u 1000 scm \ + && mkdir ${SCM_HOME} \ + && chown scm:scm ${SCM_HOME} +ADD scm-server/target/scm-server-app.tar.gz /opt +RUN chown -R scm:scm /opt/scm-server + +WORKDIR /opt/scm-server +VOLUME [ "${SCM_HOME}", "/opt/scm-server/var/log" ] EXPOSE 8080 USER scm -WORKDIR /opt/scm-server ENTRYPOINT [ "/opt/scm-server/bin/scm-server" ] diff --git a/Jenkinsfile b/Jenkinsfile index 50a2374544..f05302ad00 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,6 +44,14 @@ node() { // No specific label currentBuild.result = 'UNSTABLE' } } + + stage('Build Docker Image') { + // TODO only on mainBranch + def image = docker.build("cloudogu/scm-manger:2.0.0-dev-b${BUILD_NUMBER}") + withRegistry('index.docker.io', 'hub.docker.com-cesmarvin') { + image.push() + } + } } // Archive Unit and integration test results, if any diff --git a/helm/.helmignore b/helm/.helmignore deleted file mode 100644 index f0c1319444..0000000000 --- a/helm/.helmignore +++ /dev/null @@ -1,21 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj diff --git a/helm/Chart.yaml b/helm/Chart.yaml deleted file mode 100644 index 80f0b22a93..0000000000 --- a/helm/Chart.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v1 -appVersion: "1.0" -description: A Helm chart for Kubernetes -name: scm-manager -version: 0.1.0 diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt deleted file mode 100644 index a58c8f124a..0000000000 --- a/helm/templates/NOTES.txt +++ /dev/null @@ -1,19 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range .Values.ingress.hosts }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "scm-manager.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get svc -w {{ include "scm-manager.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "scm-manager.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ include "scm-manager.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl port-forward $POD_NAME 8080:80 -{{- end }} diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl deleted file mode 100644 index 23d4e1b03e..0000000000 --- a/helm/templates/_helpers.tpl +++ /dev/null @@ -1,32 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "scm-manager.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "scm-manager.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "scm-manager.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml deleted file mode 100644 index ae950f3fad..0000000000 --- a/helm/templates/deployment.yaml +++ /dev/null @@ -1,69 +0,0 @@ -apiVersion: apps/v1beta2 -kind: Deployment -metadata: - name: {{ include "scm-manager.fullname" . }} - labels: - app: {{ include "scm-manager.name" . }} - chart: {{ include "scm-manager.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - replicas: {{ .Values.replicaCount }} - selector: - matchLabels: - app: {{ include "scm-manager.name" . }} - release: {{ .Release.Name }} - template: - metadata: - labels: - app: {{ include "scm-manager.name" . }} - release: {{ .Release.Name }} - spec: - initContainers: - - name: volume-permissions - image: alpine:3.8 - command: ['sh', '-c', 'chown 1000:1000 /data'] - volumeMounts: - - name: data - mountPath: /data - containers: - - name: {{ .Chart.Name }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - name: http - containerPort: 8080 - protocol: TCP - livenessProbe: - httpGet: - path: /scm - port: http - readinessProbe: - httpGet: - path: /scm - port: http - volumeMounts: - - name: data - mountPath: /var/lib/scm - resources: -{{ toYaml .Values.resources | indent 12 }} - volumes: - - name: data - {{- if .Values.persistence.enabled }} - persistentVolumeClaim: - claimName: {{ include "scm-manager.fullname" . }} - {{- else }} - emptyDir: {} - {{- end }} - {{- with .Values.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} diff --git a/helm/templates/ingress.yaml b/helm/templates/ingress.yaml deleted file mode 100644 index 66912c9d96..0000000000 --- a/helm/templates/ingress.yaml +++ /dev/null @@ -1,38 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "scm-manager.fullname" . -}} -{{- $ingressPath := .Values.ingress.path -}} -apiVersion: extensions/v1beta1 -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - app: {{ include "scm-manager.name" . }} - chart: {{ include "scm-manager.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -{{- with .Values.ingress.annotations }} - annotations: -{{ toYaml . | indent 4 }} -{{- end }} -spec: -{{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} -{{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ . | quote }} - http: - paths: - - path: {{ $ingressPath }} - backend: - serviceName: {{ $fullName }} - servicePort: http - {{- end }} -{{- end }} diff --git a/helm/templates/pvc.yaml b/helm/templates/pvc.yaml deleted file mode 100644 index 0e7d0f6db4..0000000000 --- a/helm/templates/pvc.yaml +++ /dev/null @@ -1,24 +0,0 @@ -{{- if .Values.persistence.enabled -}} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ include "scm-manager.fullname" . }} - labels: - app: {{ include "scm-manager.name" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" -spec: - accessModes: - - {{ .Values.persistence.accessMode | quote }} - resources: - requests: - storage: {{ .Values.persistence.size | quote }} -{{- if .Values.persistence.storageClass }} -{{- if (eq "-" .Values.persistence.storageClass) }} - storageClassName: "" -{{- else }} - storageClassName: "{{ .Values.persistence.storageClass }}" -{{- end }} -{{- end }} -{{- end -}} diff --git a/helm/templates/service.yaml b/helm/templates/service.yaml deleted file mode 100644 index f3a8207908..0000000000 --- a/helm/templates/service.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "scm-manager.fullname" . }} - labels: - app: {{ include "scm-manager.name" . }} - chart: {{ include "scm-manager.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: 8080 - protocol: TCP - name: http - selector: - app: {{ include "scm-manager.name" . }} - release: {{ .Release.Name }} diff --git a/helm/values.yaml b/helm/values.yaml deleted file mode 100644 index e168b86c6d..0000000000 --- a/helm/values.yaml +++ /dev/null @@ -1,67 +0,0 @@ -# Default values for scm-manager. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: cloudogu/scm-manager - tag: latest - pullPolicy: IfNotPresent - -nameOverride: "" -fullnameOverride: "" - -service: - type: ClusterIP - port: 80 - -ingress: - enabled: true - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - path: / - hosts: - - scm-manager.local - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -persistence: - enabled: true - ## ghost data Persistent Volume Storage Class - ## If defined, storageClassName: - ## If set to "-", storageClassName: "", which disables dynamic provisioning - ## If undefined (the default) or set to null, no storageClassName spec is - ## set, choosing the default provisioner. (gp2 on AWS, standard on - ## GKE, AWS & OpenStack) - ## - # storageClass: "-" - accessMode: ReadWriteOnce - size: 10Gi - -resources: - requests: - memory: 1Gi - cpu: 500m - limits: - memory: 2Gi - cpu: 1 - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -nodeSelector: {} - -tolerations: [] - -affinity: {}