Skip to content

Commit

Permalink
fix: moved SHM_SIZE to .env fixed gh action for Docker hub
Browse files Browse the repository at this point in the history
  • Loading branch information
ABeltramo committed Aug 29, 2021
1 parent b49a511 commit 15d246c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 12 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ local_state=./local_state
# Use 'service:xorg' if running on a recent enough docker-compose version
# Use 'host' if your Docker version can't support the service format
SHARED_IPC=host
SHM_SIZE=500M
# Use 'shareable' with service:xorg
# Use 'host' with 'host'
XORG_IPC=host
Expand Down
11 changes: 1 addition & 10 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,7 @@ jobs:
PUSH=false
if [ -n "${{ secrets.DOCKERHUB_TOKEN }}" ]; then
if [ -n "${{ secrets.DOCKERHUB_ORG }}" ]; then
# If explicitly set org, use it
IMAGES="${{ secrets.DOCKERHUB_ORG }}/${{ matrix.image.name }}"
elif [[ $github.repository_owner == games-on-whales ]]; then
# For oficial repository, github and org names do not match
IMAGES="gameonwhales/${{ matrix.image.name }}"
else
# By default, assume docker and github org names match
IMAGES="${{ github.repository_owner }}/${{ matrix.image.name }}"
fi
IMAGES="${{ secrets.DOCKERHUB_ORG }}/${{ matrix.image.name }}"
PUSH=true
echo ::set-output name=has_docker_token::true
fi
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ services:
- type: tmpfs
target: /dev/shm
tmpfs:
size: 500M
size: ${SHM_SIZE}
ipc: ${SHARED_IPC} # Needed for MIT-SHM, removing this should cause a performance hit see https://github.com/jessfraz/dockerfiles/issues/359
environment:
DISPLAY: ${XORG_DISPLAY}
Expand Down Expand Up @@ -179,7 +179,7 @@ services:
# - type: tmpfs
# target: /dev/shm
# tmpfs:
# size: 500M
# size: ${SHM_SIZE}
# ipc: ${SHARED_IPC} # Needed for MIT-SHM, removing this should cause a performance hit see https://github.com/jessfraz/dockerfiles/issues/359
# environment:
# DISPLAY: ${XORG_DISPLAY}
Expand Down

0 comments on commit 15d246c

Please sign in to comment.