ci: build full image with webui enabled

silv3rr · Aug 22, 2024 · 6e8dd1d · 6e8dd1d
1 parent 36b2b67
commit 6e8dd1d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -36,11 +36,9 @@ jobs:
       - name: Push images
         run: |
           docker tag docker-glftpd:latest ghcr.io/silv3rr/docker-glftpd:latest
-          #docker tag docker-glftpd-web:latest ghcr.io/silv3rr/docker-glftpd-web:latest
           docker push ghcr.io/silv3rr/docker-glftpd:latest
-          #docker push ghcr.io/silv3rr/docker-glftpd-web:latest
       - name: Build full glftpd image
-        run: INSTALL_WEBUI=0 INSTALL_ZS=1 INSTALL_BOT=1 ./docker-build.sh
+        run: INSTALL_WEBUI=1 INSTALL_ZS=1 INSTALL_BOT=1 ./docker-build.sh
       - name: Push full image
         run: |
           docker tag docker-glftpd:latest ghcr.io/silv3rr/docker-glftpd:full

diff --git a/bin/labels.sh b/bin/labels.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 CONTAINER="${1:-docker-glftpd}"
 docker image inspect --format='{{ index .Config.Labels "gl.sitebot.setup" }}' "$CONTAINER"

diff --git a/docker-run.sh b/docker-run.sh
@@ -91,9 +91,11 @@ if [ "${DEBUG:-0}" -eq 0 ]; then
   WEBUI_ARGS+=" --detach "
 fi
 
+#WEBUI_ARGS+=" --add-host glftpd:127.0.0.1 "
+
 if [ -z "$NETWORK" ]; then
   DOCKER_NETWORK="$(docker network ls --format '{{.Name}}' --filter 'Name=shit')"
-  if [ -n "$DOCKER_NETWORK" ] && [ "$DOCKER_NETWORK" = "shit" ];  then
+  if [ -n "$DOCKER_NETWORK" ] && [ "$DOCKER_NETWORK" = "shit" ]; then
     NETWORK="shit"
   fi
 fi