Skip to content

Conversation

@FWest98
Copy link

@FWest98 FWest98 commented Nov 26, 2020

Added a docker production-ready image based on https://gitlab.com/youtous/rainloop. Also updated and improved the docker development environment for easier use. This includes the introduction of .env file support for customizing the ports the dev app is running on.

The docker build of the release image is now part of the release script, with a question to the user whether or not to execute it.

Copy link
Owner

@the-djmaze the-djmaze left a comment

Choose a reason for hiding this comment

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

The following line breaks the release. Could you revert the change?

$tar->buildFromDirectory('./snappymail/', "@v/{$package->version}@");

@the-djmaze the-djmaze self-requested a review November 29, 2020 22:37
@the-djmaze the-djmaze merged commit 0173d30 into the-djmaze:master Nov 30, 2020
@the-djmaze
Copy link
Owner

I've made the change myself.
Use as release.php --docker

@FWest98
Copy link
Author

FWest98 commented Nov 30, 2020

Ah I was just about to reply. Thanks for merging! In my experience, the old version broke the build when you had a development build running since it was iterating over files in /data that were not always accessible, even though they would not have been included anyway because of the filter.

What exactly broke with the new line I added? Did the archive directory structure change? Then it might be easiest to adapt the Dockerfile to use a different directory rather than adapting the release script.

@the-djmaze
Copy link
Owner

the-djmaze commented Nov 30, 2020

What exactly broke with the new line I added? Did the archive directory structure change?

Yes the directory structure changed. 'snappymail' was missing and it started with 'v'.
That's why i made it a command option.

I've also bumped docker to use 7.4-fpm and removed the obsolete mcrypt and added the missing xxtea.

Overall all the work you did are great assets!

@FWest98
Copy link
Author

FWest98 commented Nov 30, 2020

Ah ok, I thought I checked it. In that case I would propose to remove the if check from the release script and it should still work (based on https://gitlab.com/youtous/rainloop/-/blob/master/Dockerfile where they download a zip file with the same structure as the desired zip from snappymail).

I think it would also be good to replace the user query on line 123 of release.php with the value of the new docker parameter, to ease future automation of this process.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants