attempt 1
ci.vdhsn.com/push Build is failing
Details
ci.vdhsn.com/push Build is failing
Details
parent
ad7d811c35
commit
cff1ee17f1
18
Makefile
18
Makefile
|
|
@ -52,6 +52,24 @@ VERSION = $(shell git rev-parse --verify --short HEAD)
|
|||
GIT_REF = $(shell git rev-parse --verify HEAD)
|
||||
BUILD_DATE := $(shell date +%Y-%m-%d-%T)
|
||||
|
||||
.PHONY: build-swagger-image
|
||||
build-swagger-image:
|
||||
@docker build \
|
||||
--label 'com.barretthousen.service=swagger' \
|
||||
--label 'com.barretthousen.version=$(VERSION)' \
|
||||
--label 'com.barretthousen.git-ref=$(GIT_REF)' \
|
||||
--label 'com.barretthousen.build-date=$(BUILD_DATE)' \
|
||||
--label 'com.barrethousen.builder=$(BUILD_INITIATOR)' \
|
||||
-t barretthousen/service-swagger:$(VERSION) \
|
||||
-t git.vdhsn.com/barretthousen/service-swagger:$(VERSION) \
|
||||
-f ./src/Dockerfile.swagger ./src
|
||||
|
||||
@docker push git.vdhsn.com/barretthousen/service-swagger:$(VERSION)
|
||||
|
||||
@[ ! -z $(ENV) ] && docker tag git.vdhsn.com/barretthousen/service-swagger:$(VERSION) git.vdhsn.com/barretthousen/service-swagger:$(ENV) || true
|
||||
@[ ! -z $(ENV) ] && docker push git.vdhsn.com/barretthousen/service-swagger:$(ENV) || true
|
||||
|
||||
|
||||
.PHONY: build-client-image
|
||||
build-client-image:
|
||||
@docker build --target=production \
|
||||
|
|
|
|||
18
Tiltfile
18
Tiltfile
|
|
@ -131,6 +131,9 @@ def bh_backend_service(service="", port_forwards=[], migrateDB=False, devMode=Tr
|
|||
port_forwards=port_forwards,
|
||||
labels=labels,
|
||||
resource_deps=deps,
|
||||
links=[
|
||||
link(url='http://{}.localhost:8000'.format(service), name='Swagger'),
|
||||
]
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -143,6 +146,21 @@ k8s_resource(
|
|||
labels='2-services'
|
||||
)
|
||||
|
||||
docker_build(
|
||||
ref="barretthousen/service-swagger",
|
||||
dockerfile="./src/Dockerfile.swagger",
|
||||
context="./src",
|
||||
only = [
|
||||
'./auth/api/grpc/auth.swagger.json',
|
||||
'./catalog/api/grpc/catalog.swagger.json',
|
||||
'./runner/api/grpc/runner.swagger.json',
|
||||
],
|
||||
live_update=[
|
||||
sync('./src/auth/api/grpc/auth.swagger.json', '/var/doc'),
|
||||
sync('./src/catalog/api/grpc/catalog.swagger.json', '/var/doc'),
|
||||
sync('./src/runner/api/grpc/runner.swagger.json', '/var/doc')
|
||||
]
|
||||
)
|
||||
|
||||
bh_backend_service(service="auth", migrateDB=True, port_forwards=[
|
||||
port_forward(2345, name='Delve port')
|
||||
|
|
|
|||
|
|
@ -27,6 +27,13 @@ patches:
|
|||
- op: replace
|
||||
path: /spec/rules/0/host
|
||||
value: beta.barretthousen.com
|
||||
- target:
|
||||
kind: Deployment
|
||||
name: swagger
|
||||
patch: |-
|
||||
- op: replace
|
||||
path: /spec/template/spec/containers/0/image
|
||||
value: git.vdhsn.com/barretthousen/service-swagger:beta
|
||||
- target:
|
||||
kind: Deployment
|
||||
name: catalog
|
||||
|
|
|
|||
|
|
@ -6,6 +6,23 @@ spec:
|
|||
template:
|
||||
spec:
|
||||
containers:
|
||||
- name: swagger
|
||||
image: barretthousen/service-swagger:latest
|
||||
env:
|
||||
- name: SWAGGER_JSON
|
||||
value: /var/doc/auth.swagger.json
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
- name: auth
|
||||
ports:
|
||||
- containerPort: 2345
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: auth
|
||||
spec:
|
||||
ports:
|
||||
- port: 81
|
||||
targetPort: 8080
|
||||
name: swagger
|
||||
|
|
|
|||
|
|
@ -6,6 +6,23 @@ spec:
|
|||
template:
|
||||
spec:
|
||||
containers:
|
||||
- name: swagger
|
||||
image: barretthousen/service-swagger:latest
|
||||
env:
|
||||
- name: SWAGGER_JSON
|
||||
value: /var/doc/catalog.swagger.json
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
- name: catalog
|
||||
ports:
|
||||
- containerPort: 2345
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: catalog
|
||||
spec:
|
||||
ports:
|
||||
- port: 81
|
||||
targetPort: 8080
|
||||
name: swagger
|
||||
|
|
|
|||
|
|
@ -6,6 +6,23 @@ spec:
|
|||
template:
|
||||
spec:
|
||||
containers:
|
||||
- name: swagger
|
||||
image: barretthousen/service-swagger:latest
|
||||
env:
|
||||
- name: SWAGGER_JSON
|
||||
value: /var/doc/runner.swagger.json
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
- name: runner
|
||||
ports:
|
||||
- containerPort: 2345
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: runner
|
||||
spec:
|
||||
ports:
|
||||
- port: 81
|
||||
targetPort: 8080
|
||||
name: swagger
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ patchesStrategicMerge:
|
|||
- image-pull-secret.yaml
|
||||
- proxy-admin-secret.yaml
|
||||
- proxy-web-secret.yaml
|
||||
- swagger.yaml
|
||||
|
||||
patches:
|
||||
- target:
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
apiVersion: networking.k8s.io/v1
|
||||
kind: Ingress
|
||||
metadata:
|
||||
name: web
|
||||
spec:
|
||||
rules:
|
||||
- host: bh.localhost
|
||||
http:
|
||||
paths:
|
||||
- pathType: Prefix
|
||||
path: "/swagger/auth"
|
||||
backend:
|
||||
service:
|
||||
name: auth
|
||||
port:
|
||||
number: 81
|
||||
- pathType: Prefix
|
||||
path: "/swagger/catalog"
|
||||
backend:
|
||||
service:
|
||||
name: catalog
|
||||
port:
|
||||
number: 81
|
||||
- pathType: Prefix
|
||||
path: "/swagger/runner"
|
||||
backend:
|
||||
service:
|
||||
name: runner
|
||||
port:
|
||||
number: 81
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
FROM swaggerapi/swagger-ui
|
||||
|
||||
COPY ./auth/api/grpc/auth.swagger.json /var/doc/
|
||||
COPY ./catalog/api/grpc/catalog.swagger.json /var/doc/
|
||||
COPY ./runner/api/grpc/runner.swagger.json /var/doc
|
||||
Loading…
Reference in New Issue