Merge pull request #19 from SteveKueng/docker

update docker build
SteveKueng · Sep 17, 2023 · 251d78f · 251d78f
2 parents e44234e + c618d3c
commit 251d78f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -2,9 +2,9 @@ name: Docker Image CI
 
 on:
  push:
- branches: [ "mwa2" ]
+ branches: [ "main" ]
  pull_request:
- branches: [ "mwa2" ]
+ branches: [ "main" ]
 
 jobs:
 
@@ -14,5 +14,14 @@ jobs:
 
  steps:
  - uses: actions/checkout@v3
+ - name: docker login
+ env:
+ DOCKER_USER: ${{secrets.DOCKER_USER}}
+ DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
+ run: |
+ docker login -u $DOCKER_USER -p $DOCKER_PASSWORD 
  - name: Build the Docker image
- run: docker build . --file Dockerfile
+ run: docker build app --file app/Dockerfile.prod --tag stevekueng/munkiwebadmin:$(date +%s)
+
+ - name: Docker Push
+ run: docker push stevekueng/munkiwebadmin
diff --git a/app/Dockerfile.prod b/app/Dockerfile.prod
@@ -61,6 +61,8 @@ RUN pip install --upgrade pip
 RUN pip install --no-cache /wheels/*
 COPY --from=builder /tmp/munkitools /munkitools
 
+RUN chmod +x /home/app/web/entrypoint.prod.sh
+
 # nginx config
 COPY munkiwebadmin/munkiwebadmin.conf /etc/nginx/sites-available/default