Skip to content

Test new SSL approach #13

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.

Sign up for GitHub

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

Merged
shrkz1 merged 2 commits into from
Oct 11, 2022
Merged

Test new SSL approach #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b687711
Test new SSL approach
shrkz1 Oct 10, 2022
476958f
Merge branch '1.x' into ssl
shrkz1 Oct 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/Docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ jobs:
with:
context: eramba
github-token: ${{ secrets.GITHUB_TOKEN }}
file: eramba/app/upgrade/vendor/eramba/docker/Dockerfile
file: eramba/Dockerfile
builder: ${{ steps.buildx.outputs.name }}
target: eramba
labels: ${{ steps.meta.outputs.labels }}
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ RUN apt-get update && apt-get install -y rsync
# Setup vhost
COPY app/upgrade/vendor/eramba/docker/apache/vhost.conf /etc/apache2/sites-available/000-default.conf

# Copy keys
COPY app/upgrade/vendor/eramba/docker/apache/ssl/mycert.crt /etc/ssl/certs/mycert.crt
COPY app/upgrade/vendor/eramba/docker/apache/ssl/mycert.key /etc/ssl/private/mycert.key

# Setup php
COPY app/upgrade/vendor/eramba/docker/php/php.ini /usr/local/etc/php/php.ini

Expand Down
1 change: 1 addition & 0 deletions docker-compose.simple-install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ services:
- app:/var/www/eramba
- ./apache/ssl/mycert.crt:/etc/ssl/certs/mycert.crt
- ./apache/ssl/mycert.key:/etc/ssl/private/mycert.key
- ./apache/vhost.conf:/etc/apache2/sites-available/000-default.conf
env_file:
- main.env
links:
Expand Down