Skip to content

Commit

Permalink
Use entrypoint.sh for container and set umask
Browse files Browse the repository at this point in the history
  • Loading branch information
albireox committed Jul 23, 2024
1 parent dcac761 commit 29cfdbb
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 4 deletions.
6 changes: 6 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.git
*Dockerfile*
*docker-compose*
node_modules
docker/
.vscode/
7 changes: 4 additions & 3 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,17 @@ jobs:
- name: Show tags
run: echo ${{ steps.set-tags.outputs.TAGS }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Log in to registry
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
- name: Build and push
id: docker_build
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
push: true
tags: ghcr.io/${{ steps.set-tags.outputs.TAGS }}
file: docker/Dockerfile
- name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
3 changes: 2 additions & 1 deletion Dockerfile → docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,5 @@ RUN echo "umask 0002" >> /etc/bash.bashrc

RUN rm -Rf lvmcam araviscam

CMD ["sh", "-c", "lvmcam $LVMCAM_CONFIG_FILE start --debug"]
COPY ./docker-entrypoint.sh /
ENTRYPOINT ["/docker-entrypoint.sh"]
3 changes: 3 additions & 0 deletions docker/docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash
umask 0002
lvmcam $LVMCAM_CONFIG_FILE start --debug

0 comments on commit 29cfdbb

Please sign in to comment.