Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
9 changes: 6 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ version: '3'
services:
web:
container_name: proxitok-web
image: ghcr.io/pablouser1/proxitok:master
Copy link
Owner

Choose a reason for hiding this comment

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

You should let docker-compose use the pre-built image, maybe you were doing some testing and forgot to undo it?

Copy link
Author

Choose a reason for hiding this comment

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

Obviously, how else could I test? It's just Github automatically picking up the docker-compose changes, this wasn't meant to make it in the PR

#image: ghcr.io/pablouser1/proxitok:latest
build:
context: ./
dockerfile: ./Dockerfile
ports:
- 8080:8080
environment:
Expand All @@ -22,8 +25,8 @@ services:
- proxitok
security_opt:
- no-new-privileges:true
cap_drop:
- ALL
#cap_drop:
Copy link
Owner

Choose a reason for hiding this comment

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

Why are you commenting out this?

Copy link
Author

Choose a reason for hiding this comment

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

It was breaking the Apache container previously. Again, the docker-compose.yml wasn't meant to be included in the PR.

# - ALL
cap_add:
- CHOWN
- SETGID
Expand Down
1 change: 1 addition & 0 deletions templates/layouts/hero.latte
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
</div>
</section>
{block extra}{/block}
<script src="{static('js', 'video_volume.js')}"></script>
</body>

</html>