Merge pull request #965 from openziti/817-linux-package-manage-etczrok-dir

avoid linux packaged file conflicts

.goreleaser-linux-amd64.yml

@@ -112,9 +112,6 @@ nfpms:
       - dst: /usr/lib/systemd/user/
         src: ./nfpm/zrok-share@.service
 
-      - dst: /etc/systemd/system/zrok-share.service.d/override.conf
-        src: ./nfpm/zrok-share.service.override.conf
-
       - dst: /opt/openziti/etc/zrok
         type: dir
         file_info:

.goreleaser-linux-arm64.yml

@@ -116,9 +116,6 @@ nfpms:
       - dst: /usr/lib/systemd/user/
         src: ./nfpm/zrok-share@.service
 
-      - dst: /etc/systemd/system/zrok-share.service.d/override.conf
-        src: ./nfpm/zrok-share.service.override.conf
-
       - dst: /opt/openziti/etc/zrok
         type: dir
         file_info:

.goreleaser-linux-armel.yml

@@ -120,9 +120,6 @@ nfpms:
       - dst: /usr/lib/systemd/user/
         src: ./nfpm/zrok-share@.service
 
-      - dst: /etc/systemd/system/zrok-share.service.d/override.conf
-        src: ./nfpm/zrok-share.service.override.conf
-
       - dst: /opt/openziti/etc/zrok
         type: dir
         file_info:

.goreleaser-linux-armhf.yml

@@ -118,9 +118,6 @@ nfpms:
       - dst: /usr/lib/systemd/user/
         src: ./nfpm/zrok-share@.service
 
-      - dst: /etc/systemd/system/zrok-share.service.d/override.conf
-        src: ./nfpm/zrok-share.service.override.conf
-
       - dst: /opt/openziti/etc/zrok
         type: dir
         file_info:

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 FIX: `zrok enable` now handles the case where the user ID does not resolve to a username when generating the default environment description (https://github.com/openziti/zrok/issues/959)
 
+FIX: Linux packages were optimized to avoid manage file revision conflicts (https://github.com/openziti/zrok/issues/817)
+
 ## v1.0.4
 
 FIX: `zrok admin bootstrap` and `zrok enable` functionality were broken in `v1.0.3`. A bad combination of dependencies caused issues with marshalling data from the associated controller endpoints

docker/images/cross-build/Dockerfile

@@ -1,6 +1,4 @@
-FROM goreleaser/goreleaser AS goreleaser
+FROM golang:1.24 AS golang
-
-FROM golang:1.21 AS golang
 
 FROM debian:bookworm-slim
 #
@@ -9,7 +7,6 @@ FROM debian:bookworm-slim
 #
 
 ARG TARGETARCH
-ARG golang_version=1.21.3
 ARG go_path=/usr/share/go
 ARG go_root=/usr/local/go
 ARG go_cache=/usr/share/go
@@ -23,17 +20,13 @@ RUN apt-get -y update \
         git \
         build-essential
 
-
+RUN wget -qO- https://deb.nodesource.com/setup_20.x | bash \
-RUN wget -qO- https://deb.nodesource.com/setup_18.x | bash \
     && apt-get -y update \
     && apt-get -y install \
         nodejs
 
-
 COPY --from=golang /usr/local/go /usr/local/go
 
-COPY --from=goreleaser /usr/bin/goreleaser /usr/local/bin/goreleaser
-
 COPY ./linux-build.sh /usr/local/bin/linux-build.sh
 
 ENV TARGETARCH=${TARGETARCH}

docker/images/cross-build/linux-build.sh

@@ -30,7 +30,8 @@ fi
     HOME=/tmp/builder
     # Navigate to the "ui" directory and run npm commands
     mkdir -p $HOME
-    npm config set cache /mnt/.npm
+    # pwd is probably /mnt mountpoint in the container
+    npm config set cache $(pwd)/.npm
     for UI in ./ui ./agent/agentUi
     do
         pushd ${UI}
@@ -40,11 +41,26 @@ fi
     done
 )
 
-for ARCH in "${JOBS[@]}"; do
+# Get version information
-    goreleaser build \
+VERSION=$(git describe --tags --abbrev=0 2>/dev/null || echo "v1.0.x")
-    --clean \
+STEPS=$(git rev-list --count ${VERSION}..HEAD 2>/dev/null || echo "0")
-    --snapshot \
+if [ "$STEPS" -gt "0" ]; then
-    --output "./dist/" \
+    VERSION="${VERSION}-${STEPS}"
-    --config "./.goreleaser-linux-$(resolveArch "${ARCH}").yml"
+fi
-done
 
+# Check if working copy is dirty
+if [ -z "$(git status --porcelain)" ]; then
+    # Clean working directory
+    HASH=$(git rev-parse --short HEAD)
+else
+    # Dirty working directory
+    HASH="developer build"
+fi
+
+for ARCH in "${JOBS[@]}"; do
+    LDFLAGS="-s -w -X 'github.com/openziti/zrok/build.Version=${VERSION}' -X 'github.com/openziti/zrok/build.Hash=${HASH}'"
+    GOOS=linux GOARCH=$(resolveArch "${ARCH}") \
+    go build -o "./dist/$(resolveArch "${ARCH}")/linux/zrok" \
+    -ldflags "${LDFLAGS}" \
+    ./cmd/zrok
+done

nfpm/zrok-share.service

@@ -13,5 +13,8 @@ ExecStart=/opt/openziti/bin/zrok-share.bash
 Restart=always
 RestartSec=3
 
+# allow adding tun device and IP routes and iptables rules; required when ZROK_BACKEND_MODE=vpn
+# AmbientCapabilities=CAP_NET_ADMIN
+
 [Install]
 WantedBy=multi-user.target

nfpm/zrok-share.service.override.conf

@@ -1,8 +0,0 @@
-[Service]
-
-#
-## extra permissions
-#
-
-# allow adding tun device and IP routes and iptables rules; required when ZROK_BACKEND_MODE=vpn
-# AmbientCapabilities=CAP_NET_ADMIN