Optimize nginx reloading usage v2

Atleta-network · Sep 3, 2024 · 4baa069 · 4baa069
1 parent 096d9ac
commit 4baa069
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 60 deletions.
diff --git a/.github/workflows/deploy-atleta.yml b/.github/workflows/deploy-atleta.yml
@@ -10,16 +10,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: "recursive"
 
     - name: Create Image Tarball for Explorer
       run: |
-        docker build -t sportchain-explorer -f docker/Dockerfile .
-        docker save -o sportchain-explorer.tar sportchain-explorer
         mkdir -p artifacts/
-        mv sportchain-explorer.tar artifacts/
+        docker build --tag sportchain-explorer --file docker/Dockerfile .
+        docker save --output artifacts/sportchain-explorer.tar sportchain-explorer
 
     - name: Set up SSH
       run: |
@@ -43,5 +42,5 @@ jobs:
         key: ${{ secrets.EXPLORER_PRIVATE_KEY }}
         script: |
           cd /sportchain
-          docker load -i sportchain-explorer.tar
-          docker compose up -d
+          docker load --input sportchain-explorer.tar
+          docker compose up --detach
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -31,13 +31,12 @@ RUN apk add --no-cache bash; chmod +x env.sh
 COPY docker/nginx /etc/nginx
 COPY --from=builder /apps/packages/apps/build /usr/share/nginx/html
 
-COPY docker/nginx-container/docker-entrypoint.sh /
 COPY docker/nginx-container/check_ssl.sh /
 
-ENTRYPOINT ["/docker-entrypoint.sh"]
+ENTRYPOINT ["/bin/bash", "-c"]
 
 EXPOSE 80
 
 STOPSIGNAL SIGQUIT
 
-CMD ["/bin/bash", "-c", "/usr/share/nginx/html/env.sh && nginx -g \"daemon off;\""]
+CMD ["/check_ssl.sh & /usr/share/nginx/html/env.sh && exec /docker-entrypoint.sh nginx -g 'daemon off;'"]
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -11,7 +11,6 @@ services:
     volumes:
       - ./nginx/ssl:/etc/nginx/ssl:ro
       - ./certbot/www:/var/www/certbot:ro
-    command: /bin/bash -c "/usr/share/nginx/html/env.sh && nginx -g 'daemon off;' & /check_ssl.sh"
 
     ports:
       - "0.0.0.0:80:80"
@@ -22,7 +21,7 @@ services:
   certbot:
     image: certbot/certbot:v2.10.0
     container_name: sportchain-explorer-certbot
-    restart: unless-stopped
+    restart: always
     volumes:
       - ./nginx/ssl:/etc/letsencrypt:rw
       - ./certbot/www:/var/www/certbot:rw

diff --git a/docker/nginx-container/docker-entrypoint.sh b/docker/nginx-container/docker-entrypoint.sh