openprivacy
/
lockbox-web
3
1
Fork 1
Code Issues Pull Requests 2 Releases Wiki Activity

Dockerize Lockbox #2

Open
norman wants to merge 3 commits from norman/lockbox-web:dockerize into master
pull from: norman/lockbox-web:dockerize
merge into: openprivacy:master
Conversation 0 Commits 3 Files Changed 15 +51 -13
norman commented 2020-12-17 01:14:47 +00:00
Member
Copy Link

Created a dockerized version of Lockbox. Key changes:

  • Restructured the repository
  • Pulled out run customizations into an env.php file. Future work is aimed to convert this into environment variables or similar to help automate deploys.
  • Created Dockerfile based on php:7.4-apache
  • Adjusted REAMDE.md to help with building a docker image
Created a dockerized version of Lockbox. Key changes: * Restructured the repository * Pulled out run customizations into an `env.php` file. Future work is aimed to convert this into environment variables or similar to help automate deploys. * Created Dockerfile based on `php:7.4-apache` * Adjusted REAMDE.md to help with building a docker image
This pull request has changes conflicting with the target branch.
  • README.md
  • admin.php
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b norman-dockerize master
git pull dockerize

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff norman-dockerize
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: openprivacy/lockbox-web#2
No description provided.
Delete Branch "norman/lockbox-web:dockerize"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?