Skip to content

Commit

Permalink
Add simplified docker-compose:
Browse files Browse the repository at this point in the history
The previous deploy directory was spinning up
more than just tink. This is a duplicate of what is
in the sandbox repo. This commit adds a basic docker-compose
for just tink server and tink cli. Easy to use make target
`run` will build the binaries first and then up the stack.

Signed-off-by: Jacob Weinstock <[email protected]>
  • Loading branch information
jacobweinstock committed Jun 29, 2021
1 parent 7f829f5 commit 9509c68
Show file tree
Hide file tree
Showing 16 changed files with 117 additions and 503 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ all: cli server worker ## Build all binaries for host OS and CPU

crosscompile: $(crossbinaries) ## Build all binaries for Linux and all supported CPU arches
images: tink-cli-image tink-server-image tink-worker-image ## Build all docker images
run: crosscompile run-stack ## Builds and runs the Tink stack (tink, db, cli) via docker-compose

test: ## Run tests
go clean -testcache
Expand Down
2 changes: 1 addition & 1 deletion db/mock/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,5 @@ func (d DB) UpdateTemplate(ctx context.Context, name string, data string, id uui

// ClearTemplateDB clear all the templates
func (d DB) ClearTemplateDB() {
d.TemplateDB = make(map[string]interface{})
d.TemplateDB = make(map[string]interface{}) // nolint
}
78 changes: 0 additions & 78 deletions deploy/db/tinkerbell-init.sql

This file was deleted.

162 changes: 0 additions & 162 deletions deploy/docker-compose.yml

This file was deleted.

7 changes: 0 additions & 7 deletions deploy/registry/Dockerfile

This file was deleted.

1 change: 0 additions & 1 deletion deploy/tls/.gitignore

This file was deleted.

7 changes: 0 additions & 7 deletions deploy/tls/Dockerfile

This file was deleted.

12 changes: 0 additions & 12 deletions deploy/tls/ca.in.json

This file was deleted.

File renamed without changes.
13 changes: 0 additions & 13 deletions deploy/tls/entrypoint.sh

This file was deleted.

30 changes: 0 additions & 30 deletions deploy/tls/gencerts.sh

This file was deleted.

7 changes: 7 additions & 0 deletions deploy/tls/generate.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/env bash

cfssl gencert -initca /code/tls/csr.json | cfssljson -bare ca -
cfssl gencert -config /code/tls/ca-config.json -ca ca.pem -ca-key ca-key.pem -profile server /code/tls/csr.json | cfssljson -bare server
cat server.pem ca.pem >/certs/"${FACILITY:-onprem}"/bundle.pem
mv server-key.pem /certs/"${FACILITY:-onprem}"/server-key.pem
rm -rf ca-key.pem ca.csr ca.pem server.csr server.pem
Loading

0 comments on commit 9509c68

Please sign in to comment.