Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move tink-server deploy/db files into top-level deploy dir #117

Merged
merged 1 commit into from
May 18, 2020
Merged

Move tink-server deploy/db files into top-level deploy dir #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions cmd/tink-server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,4 @@ EXPOSE 42114
RUN apk add --update ca-certificates && \
apk add --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing cfssl

COPY deploy/db/migrate /migrate
COPY deploy/db/docker-entrypoint-initdb.d/tinkerbell-init.sql /init.sql
COPY tink-server /bin/
3 changes: 0 additions & 3 deletions cmd/tink-server/deploy/db/Dockerfile
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions cmd/tink-server/deploy/db/migrate
View file
Open in desktop

This file was deleted.

0 ...r-entrypoint-initdb.d/tinkerbell-init.sql → deploy/db/tinkerbell-init.sql
View file
Open in desktop
File renamed without changes.
11 changes: 6 additions & 5 deletions deploy/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,14 @@ services:
- 42114:42114/tcp

db:
build:
context: db
image: postgres:10-alpine
restart: unless-stopped
environment:
POSTGRES_DB: tinkerbell
POSTGRES_PASSWORD: tinkerbell
POSTGRES_USER: tinkerbell
volumes:
- ./db/tinkerbell-init.sql:/docker-entrypoint-initdb.d/tinkerbell-init.sql:ro
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not actually finding a local folder called db in the deploy folder after running setup.sh?

Screenshot 2020-05-18 at 14 10 48

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because setup.sh fetches from master. I commented out the git fetch bit and used my own clone of this pr and it worked out fine.

ports:
- 5432:5432
depends_on:
Expand Down Expand Up @@ -143,7 +144,7 @@ services:
- $TINKERBELL_HOST_IP:80:80/tcp
- 67:67/udp
- 69:69/udp

nginx:
image: nginx:alpine
restart: unless-stopped
Expand Down Expand Up @@ -210,7 +211,7 @@ services:
logging:
driver: fluentd
options:
tag: cacher
tag: cacher
depends_on:
fluentbit:
condition: service_started
Expand All @@ -228,7 +229,7 @@ services:
ROLLBAR_TOKEN: ${ROLLBAR_TOKEN-ignored}
ROLLBAR_DISABLE: 1
PACKET_ENV: testing
PACKET_VERSION: ${PACKET_VERSION:-ignored}
PACKET_VERSION: ${PACKET_VERSION:-ignored}
GRPC_PORT: 42115
HEGEL_FACILITY: ${FACILITY:-onprem}
HEGEL_USE_TLS: 0
Expand Down