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

updated dockerfile #840

Merged
merged 2 commits into from
Jun 5, 2019
Merged

updated dockerfile #840

merged 2 commits into from
Jun 5, 2019

Conversation

kevinpapst
Copy link
Member

Description

See #763

@tobybatch can you please review?

Checklist

  • I agree that this code is used in Kimai and will be published under the MIT license

@kevinpapst kevinpapst mentioned this pull request Jun 4, 2019
@tobybatch
Copy link
Member

tobybatch commented Jun 5, 2019

@bsumners Yes the refactor has happened. The docker repo is now building against tagged releases, 0.9 is the latest. https://github.com/tobybatch/kimai2 or if you just want the images https://cloud.docker.com/u/kimai/repository/docker/kimai/kimai2

@kevinpapst The dev docker in this repo will only change if we need to change the dependencies in it. That will only happen if we change the OS/PGO set up. When you tag a new release oing me and I'll add a new tag to the dockerfiles in my repo. Perhaps one day I'll automate that.

@kevinpapst
Copy link
Member Author

So you are saying I shouldn't merge this, as it relies on your base image?
Or are you saying this is likely the last change we will see in a while?

@tobybatch
Copy link
Member

Yes, that's fine. The base image will get pulled from dockerhub if it's needed. If you want to include it in the kimai2 repo I can add it.

@kevinpapst
Copy link
Member Author

I would totally like that!

@tobybatch
Copy link
Member

Sorry @kevinpapst my local kimai repo is all messed up with the LDAP stuff, here is a gist with the docker file that will build both stages of the dev docker. I'll fix my repo to use this format for dev later. If you drop that into your repo it will include the base build.

https://gist.github.com/tobybatch/902ee71f9814239e70680e6ba07b4c2a

@kevinpapst
Copy link
Member Author

Hm, I think we are talking about different things. I thought that you said in #763 that I should copy the new Dockerfile for the dev image into the Kimai repo.
But your gist looks like the Dockerfile which is already existing in here.

My assumption was, that I should copy & paste this Dockerfile:
https://github.com/tobybatch/kimai2/blob/master/Dockerfile
into the kimai 2 repository here. Was that a misunderstading?

@tobybatch
Copy link
Member

The gist should replace the one in your repo, totally. It uses a build stage to in line the kimai base into the kimai dev image build process. This means you have the whole build change in a single file and removes dependencies on external resources.

It is hand crafted for your repo at the moment. I'll add a build process into the docker repos when I get a sec.

@kevinpapst
Copy link
Member Author

Alright, after having a look at the diff it is clearer, updated.

@kevinpapst kevinpapst added this to the 1.0 milestone Jun 5, 2019
@kevinpapst kevinpapst merged commit ab405f6 into master Jun 5, 2019
@kevinpapst kevinpapst deleted the docker-update branch June 5, 2019 11:56
@lock
Copy link

lock bot commented Aug 4, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. If you use Kimai on a daily basis, please consider donating to support further development of Kimai.

@lock lock bot locked and limited conversation to collaborators Aug 4, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants