Sam 169 update libreoffice #3
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nunomsfranco
commented
Sep 7, 2018
nunomsfranco
commented
- Changed Dockerfile to update the libre office and libreoffice-kit to 6.0
…k-end-dev-env to master Merge SAM-195-set-up-back-end-dev-env to master branch * commit '8d08435d554281b01a37e9db4c242959ea456aac': forked docsbox service, added git ignore and modified README
Retrieves non-zip file. Updated README file
…perate-convertion-from-upload to master merged SAM-172-seperate-convertion-from-upload to master * commit '18fe3e8d30f0c1dc98fc40e7878443b0ed150df4': fix: upload saves correctly the file now actualized gitignore, added new REST for upload, convert and a GET for filetype fix: added comment to the new const Added new const in settings.py for disabling/enabling thumbnails
numsu
requested changes
Sep 11, 2018
docsbox/Dockerfile
Outdated
| RUN apt-get install -y libreoffice libreofficekit-dev | ||
| RUN apt-get install software-properties-common -y | ||
| RUN add-apt-repository ppa:libreoffice/ppa | ||
| RUN apt update |
There was a problem hiding this comment.
It would be better to use apt-get or apt, not both. Also, apt-get update is ran already above, if you add the repository before that, we dont need to run it again.
There was a problem hiding this comment.
I changed the apt command for apt-get
The order I had to keep:
- software-properties-common needs to run after apt-get update
- add-apt-repository needs software-properties-common to run
- and after add-apt-repository I need to run apt-get update again
docsbox/Dockerfile
Outdated
| RUN apt-get install software-properties-common -y | ||
| RUN add-apt-repository ppa:libreoffice/ppa | ||
| RUN apt update | ||
| RUN apt install libreoffice -y libreoffice libreofficekit-dev -y |
There was a problem hiding this comment.
changed the line to:
- apt-get install -y libreoffice libreofficekit-dev
numsu
approved these changes
Sep 12, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.