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.

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

Conversation

mmlb
Copy link
Contributor

@mmlb mmlb commented May 14, 2020

tink-server does not do anything with these files currently. These files
really do belong in the tink-server container image but we need better
migration handling -server before these file can come into it.

@mmlb
Copy link
Contributor Author

mmlb commented May 14, 2020

I split them like this since tink-server/Dockerfile was adding them. I thought tink-server had an entrypoint script that would run migrations. That isn't the case though.

@mmlb mmlb requested a review from gauravgahlot May 14, 2020 17:39
deploy/docker-compose.yml Outdated Show resolved Hide resolved
@mmlb mmlb force-pushed the fix-db-setup-post-cmd-move branch 2 times, most recently from 6e389cc to 29d8cde Compare May 14, 2020 18:41
iaguis
iaguis previously approved these changes May 14, 2020
Copy link

@iaguis iaguis left a comment

Choose a reason for hiding this comment

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

lgtm

@alexellis
Copy link
Contributor

Good to see a fix for this. When do we think this PR could get merged?

Looks like a few people (and now me, are running into this)

Screenshot 2020-05-18 at 14 07 11

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.

@alexellis
Copy link
Contributor

If anyone else is landing here run:

docker exec -ti deploy_db_1 psql -U tinkerbell  

Then paste in from https://raw.githubusercontent.com/tinkerbell/tink/29d8cde68c019de76c40bc6ffaebf60209c2e5a8/deploy/db/tinkerbell-init.sql

tink-server does not do anything with these files currently. These files
really do belong in the tink-server container image but we need better
migration handling -server before these file can come into it.
@parauliya
Copy link
Contributor

Hi @gauravgahlot @mmlb , This PR needs to be merged asap, without this PR setup script will not work since db folder has been removed from the deploy folder in tink repo.

@mmlb
Copy link
Contributor Author

mmlb commented May 18, 2020

Yep looking for some review.

@mmlb
Copy link
Contributor Author

mmlb commented May 18, 2020

I just ran through tf and setup off this branch and it all worked out. Can I get a 👍 @parauliya, @nathangoulding, @mikemrm

@mmlb mmlb merged commit 740d9b7 into tinkerbell:master May 18, 2020
@mmlb mmlb deleted the fix-db-setup-post-cmd-move branch May 18, 2020 16:11
@alexellis
Copy link
Contributor

Thanks @mmlb 💪

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants