Skip to content

Commit

Permalink
Testing build
Browse files Browse the repository at this point in the history
  • Loading branch information
jleach committed Jun 4, 2021
1 parent 70f037a commit 842e6cc
Show file tree
Hide file tree
Showing 14 changed files with 23,071 additions and 28 deletions.
16 changes: 8 additions & 8 deletions devops/base/web/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@ spec:
requests:
cpu: 20m
memory: 64Mi
# volumeMounts:
# - name: config-vol
# mountPath: /opt/app-root/etc/Caddyfile
# subPath: Caddyfile
# volumes:
# - name: config-vol
# configMap:
# name: timemachine-web-config
volumeMounts:
- name: config-vol
mountPath: /opt/app-root/etc/Caddyfile
subPath: Caddyfile
volumes:
- name: config-vol
configMap:
name: timemachine-web-config
---
apiVersion: v1
kind: Service
Expand Down
1 change: 1 addition & 0 deletions devops/base/web/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- deploy.yaml
- config.yaml
110 changes: 110 additions & 0 deletions devops/openshift/web-build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
apiVersion: template.openshift.io/v1
kind: Template
metadata:
labels:
app: timemachine-web
name: timemachine-build
objects:
- apiVersion: v1
kind: ImageStream
metadata:
name: timemachine-web
labels:
app: timemachine-web
- apiVersion: v1
kind: BuildConfig
metadata:
name: timemachine-web-${GIT_REF}-build
labels:
app: timemachine-web
name: timemachine-web-${GIT_REF}-build
spec:
output:
to:
kind: ImageStreamTag
name: timemachine-web:${OUTPUT_IMAGE_TAG}
resources:
limits:
cpu: ${CPU_LIMIT}
memory: ${MEMORY_LIMIT}
requests:
cpu: ${CPU_REQUEST}
memory: ${MEMORY_REQUEST}
runPolicy: Serial
source:
contextDir: ${SOURCE_CONTEXT_DIR}
git:
ref: ${GIT_REF}
uri: ${GIT_REPO_URL}
type: Git
strategy:
sourceStrategy:
env:
- name: BUILD_LOGLEVEL
value: "5"
from:
kind: ImageStreamTag
name: ${SOURCE_IMAGE_NAME}:${SOURCE_IMAGE_TAG}
namespace: ${SOURCE_IMAGE_NAMESPACE}
incremental: false
type: Source
triggers:
- type: ConfigChange
parameters:
- description: |
The URL to your GIT repo, don't use the this default unless
your just experimenting.
displayName: Git Repo URL
name: GIT_REPO_URL
required: true
value: https://github.com/bcgov/Project-and-time-tracker.git
- description: The git reference or branch.
displayName: Git Reference
name: GIT_REF
required: true
value: master
- description: The source context directory.
displayName: Source Context Directory
name: SOURCE_CONTEXT_DIR
required: false
value: "web"
- description: The tag given to the built image.
displayName: Output Image Tag
name: OUTPUT_IMAGE_TAG
required: true
value: latest
- description: The openshift project where builds and target images are stored.
displayName: Build Project
name: SOURCE_IMAGE_NAMESPACE
value: ed57f0-tools
required: true
- description: The name of the source image.
displayName: Source Image Name
name: SOURCE_IMAGE_NAME
value: 'caddy-s2i-builder'
required: true
- description: The tag of the source image.
displayName: Source Image Tag
name: SOURCE_IMAGE_TAG
value: "latest"
required: true
- description: The resources CPU limit (in cores) for this build.
displayName: Resources CPU Limit
name: CPU_LIMIT
required: true
value: "2"
- description: The resources Memory limit (in Mi, Gi, etc) for this build.
displayName: Resources Memory Limit
name: MEMORY_LIMIT
required: true
value: 2Gi
- description: The resources CPU request (in cores) for this build.
displayName: Resources CPU Request
name: CPU_REQUEST
required: true
value: "1"
- description: The resources Memory request (in Mi, Gi, etc) for this build.
displayName: Resources Memory Request
name: MEMORY_REQUEST
required: true
value: 2Gi
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 842e6cc

Please sign in to comment.