Compare commits
1 Commits
d011b29427
...
2168451562
| Author | SHA1 | Date |
|---|---|---|
|
|
2168451562 |
6
Makefile
6
Makefile
|
|
@ -16,6 +16,7 @@ clobber:
|
||||||
|
|
||||||
|
|
||||||
SERVICE = "catalog"
|
SERVICE = "catalog"
|
||||||
|
ENV = "beta"
|
||||||
ORIGIN = "https://barretthousen.com"
|
ORIGIN = "https://barretthousen.com"
|
||||||
BUILD_INITIATOR = "Development Machine"
|
BUILD_INITIATOR = "Development Machine"
|
||||||
VERSION = $(shell git rev-parse --verify --short HEAD)
|
VERSION = $(shell git rev-parse --verify --short HEAD)
|
||||||
|
|
@ -33,8 +34,11 @@ build-client-image:
|
||||||
--build-arg 'origin=$(ORIGIN)' \
|
--build-arg 'origin=$(ORIGIN)' \
|
||||||
-t barretthousen/client-$(SERVICE):$(VERSION) \
|
-t barretthousen/client-$(SERVICE):$(VERSION) \
|
||||||
-t git.vdhsn.com/barretthousen/client-$(SERVICE):$(VERSION) \
|
-t git.vdhsn.com/barretthousen/client-$(SERVICE):$(VERSION) \
|
||||||
|
-t git.vdhsn.com/barretthousen/client-$(SERVICE):$(ENV) \
|
||||||
-f ./src/$(SERVICE)/Dockerfile.frontend ./src/$(SERVICE)
|
-f ./src/$(SERVICE)/Dockerfile.frontend ./src/$(SERVICE)
|
||||||
docker push git.vdhsn.com/barretthousen/client-$(SERVICE):$(VERSION)
|
docker push git.vdhsn.com/barretthousen/client-$(SERVICE):$(VERSION)
|
||||||
|
docker push git.vdhsn.com/barretthousen/client-$(SERVICE):$(ENV)
|
||||||
|
|
||||||
|
|
||||||
.PHONY: build-backend-image
|
.PHONY: build-backend-image
|
||||||
build-backend-image:
|
build-backend-image:
|
||||||
|
|
@ -47,8 +51,10 @@ build-backend-image:
|
||||||
--build-arg "service=$(SERVICE)" \
|
--build-arg "service=$(SERVICE)" \
|
||||||
-t barretthousen/service-$(SERVICE):$(VERSION) \
|
-t barretthousen/service-$(SERVICE):$(VERSION) \
|
||||||
-t git.vdhsn.com/barretthousen/service-$(SERVICE):$(VERSION) \
|
-t git.vdhsn.com/barretthousen/service-$(SERVICE):$(VERSION) \
|
||||||
|
-t git.vdhsn.com/barretthousen/service-$(SERVICE):$(ENV) \
|
||||||
-f ./src/Dockerfile.prod-backend ./src
|
-f ./src/Dockerfile.prod-backend ./src
|
||||||
docker push git.vdhsn.com/barretthousen/service-$(SERVICE):$(VERSION)
|
docker push git.vdhsn.com/barretthousen/service-$(SERVICE):$(VERSION)
|
||||||
|
docker push git.vdhsn.com/barretthousen/service-$(SERVICE):$(ENV)
|
||||||
|
|
||||||
.PHONY: push-image
|
.PHONY: push-image
|
||||||
push-image:
|
push-image:
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
apiVersion: v1
|
||||||
|
kind: ConfigMap
|
||||||
|
metadata:
|
||||||
|
name: catalog-config
|
||||||
|
data:
|
||||||
|
config.yaml: |
|
||||||
|
log_level: 2
|
||||||
|
port: 5001
|
||||||
|
db_service:
|
||||||
|
scheme: postgres
|
||||||
|
port: 5432
|
||||||
|
host: bh-db
|
||||||
|
name: bh
|
||||||
|
user: catalog-service
|
||||||
|
password: catalog-service
|
||||||
|
db_migrate:
|
||||||
|
scheme: postgres
|
||||||
|
port: 5432
|
||||||
|
host: bh-db
|
||||||
|
name: bh
|
||||||
|
user: postgres
|
||||||
|
password: bh-admin-beta
|
||||||
|
|
@ -5,6 +5,11 @@ commonLabels:
|
||||||
nameSuffix: -beta
|
nameSuffix: -beta
|
||||||
namespace: barretthousen-beta
|
namespace: barretthousen-beta
|
||||||
|
|
||||||
|
patchesStrategicMerge:
|
||||||
|
- scrape-cronjob.yaml
|
||||||
|
- catalog-configmap.yaml
|
||||||
|
- runner-configmap.yaml
|
||||||
|
|
||||||
patches:
|
patches:
|
||||||
- target:
|
- target:
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
apiVersion: v1
|
||||||
|
kind: ConfigMap
|
||||||
|
metadata:
|
||||||
|
name: runner-config
|
||||||
|
data:
|
||||||
|
config.yaml: |
|
||||||
|
log_level: 2
|
||||||
|
port: 5001
|
||||||
|
db_service:
|
||||||
|
scheme: postgres
|
||||||
|
port: 5432
|
||||||
|
host: bh-db
|
||||||
|
name: bh
|
||||||
|
user: runner-service
|
||||||
|
password: runner-service
|
||||||
|
db_migrate:
|
||||||
|
scheme: postgres
|
||||||
|
port: 5432
|
||||||
|
host: bh-db
|
||||||
|
name: bh
|
||||||
|
user: postgres
|
||||||
|
password: bh-admin-beta
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
apiVersion: batch/v1
|
||||||
|
kind: CronJob
|
||||||
|
metadata:
|
||||||
|
name: runner-sync
|
||||||
|
spec:
|
||||||
|
schedule: "0 */2 * * *"
|
||||||
|
jobTemplate:
|
||||||
|
spec:
|
||||||
|
template:
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- name: runner-curl
|
||||||
|
command:
|
||||||
|
[
|
||||||
|
"curl",
|
||||||
|
"http://proxy-admin-beta/api/v1/sync",
|
||||||
|
'-d=''{"target":"liveauctioneers"}''',
|
||||||
|
"-vvvv",
|
||||||
|
]
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
FROM golang:1.19 as builder
|
FROM golang:1.19 as builder
|
||||||
|
|
||||||
ARG service
|
|
||||||
|
|
||||||
RUN go install github.com/bufbuild/buf/cmd/buf@v1.17.0
|
RUN go install github.com/bufbuild/buf/cmd/buf@v1.17.0
|
||||||
RUN go install github.com/kyleconroy/sqlc/cmd/sqlc@latest
|
RUN go install github.com/kyleconroy/sqlc/cmd/sqlc@latest
|
||||||
|
|
@ -12,6 +11,8 @@ WORKDIR /go/src/
|
||||||
RUN /go/bin/sqlc generate -f /go/src/sqlc.yaml
|
RUN /go/bin/sqlc generate -f /go/src/sqlc.yaml
|
||||||
RUN /go/bin/buf mod update /go/src && /go/bin/buf generate
|
RUN /go/bin/buf mod update /go/src && /go/bin/buf generate
|
||||||
|
|
||||||
|
ARG service
|
||||||
|
|
||||||
WORKDIR /go/src/${service}
|
WORKDIR /go/src/${service}
|
||||||
|
|
||||||
RUN go mod tidy \
|
RUN go mod tidy \
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue