Merge pull request #16 from mishl-dev/main

feat: load config from env and fix rustic backups bug

Author: naterfute

.github/workflows/ci.yml

@@ -25,54 +25,11 @@ jobs:
       - name: Download dependencies
         run: go mod download
 
-      - name: Download rustic binaries
-        run: make download-rustic
-
       - name: Run tests
         run: go test -race ./...
 
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    needs: test
-    strategy:
-      matrix:
-        goos: [linux]
-        goarch: [amd64, arm64]
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-go@v5
-        with:
-          go-version-file: go.mod
-          cache: true
-          check-latest: true
-
-      - name: Download rustic binaries
-        run: make download-rustic
-
-      - name: Build binary
-        env:
-          GOOS: ${{ matrix.goos }}
-          GOARCH: ${{ matrix.goarch }}
-          CGO_ENABLED: 0
-        run: |
-          VERSION=$(git describe --tags --always --dirty)
-          go build -v -trimpath \
-            -ldflags="-s -w -X github.com/pyrohost/elytra/src/system.Version=${VERSION}" \
-            -o dist/elytra_${{ matrix.goos }}_${{ matrix.goarch }} \
-            ./src/cmd/elytra
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: elytra-${{ matrix.goos }}-${{ matrix.goarch }}
-          path: dist/elytra_${{ matrix.goos }}_${{ matrix.goarch }}
-          retention-days: 7
-          compression-level: 0
-
   docker:
-    name: Docker
+    name: Docker Build & Push
     runs-on: ubuntu-latest
     needs: test
     if: github.event_name == 'push' && github.ref == 'refs/heads/main'
@@ -83,19 +40,16 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: docker/setup-qemu-action@v3
+
       - uses: docker/setup-buildx-action@v3
-        with:
-          platforms: linux/amd64,linux/arm64
 
       - uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Download rustic binaries
-        run: make download-rustic
-
       - name: Extract metadata
         id: meta
         uses: docker/metadata-action@v5

.github/workflows/release.yml

@@ -28,9 +28,6 @@ jobs:
       - name: Download dependencies
         run: go mod download
 
-      - name: Download rustic binaries
-        run: make download-rustic
-
       - name: Build release binaries
         env:
           CGO_ENABLED: 0
@@ -85,19 +82,16 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: docker/setup-qemu-action@v3
+
       - uses: docker/setup-buildx-action@v3
-        with:
-          platforms: linux/amd64,linux/arm64
 
       - uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Download rustic binaries
-        run: make download-rustic
-
       - name: Extract metadata
         id: meta
         uses: docker/metadata-action@v5

.gitignore

@@ -56,6 +56,8 @@ debug
 *.pprof
 *.pdf
 pprof.*
+data/elytra.db
+.secrets
 
 # Nix output files
 /result

Dockerfile

@@ -1,47 +1,36 @@
 # Stage 1 (Build)
-FROM golang:1.24-alpine AS builder
+FROM --platform=$BUILDPLATFORM golang:1.24-alpine AS builder
 
-ARG VERSION
-ARG RUSTIC_VERSION=0.10.0
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+ARG TARGETOS
 ARG TARGETARCH
-RUN apk add --update --no-cache git make mailcap curl bash
+ARG VERSION
+
+RUN apk add --update --no-cache git make mailcap
+
 WORKDIR /app/
 COPY go.mod go.sum /app/
-RUN go mod download
 COPY . /app/
 
-RUN case "$TARGETARCH" in \
-	amd64) \
-	ASSET="rustic-v${RUSTIC_VERSION}-x86_64-unknown-linux-musl.tar.gz" \
-	;; \
-	arm64) \
-	ASSET="rustic-v${RUSTIC_VERSION}-aarch64-unknown-linux-musl.tar.gz" \
-	;; \
-	*) \
-	echo "Unsupported architecture: $TARGETARCH"; exit 1 \
-	;; \
-	esac && \
-	mkdir -p /tmp/rustic && \
-	curl -L https://github.com/rustic-rs/rustic/releases/download/v${RUSTIC_VERSION}/${ASSET} | tar -zx -C /tmp/rustic
-
-
-RUN CGO_ENABLED=0 go build \
-	-ldflags="-s -w -X github.com/pyrohost/elytra/src/system.Version=$VERSION" \
-	-v \
-	-trimpath \
-	-o elytra \
-	./src/cmd/elytra
+RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build \
+    -ldflags="-s -w -X github.com/pyrohost/elytra/src/system.Version=$VERSION" \
+    -v \
+    -trimpath \
+    -o elytra \
+    ./src/cmd/elytra
+
 RUN echo "ID=\"distroless\"" > /etc/os-release
 
 # Stage 2 (Final)
 FROM gcr.io/distroless/static:latest
+
 COPY --from=builder /etc/os-release /etc/os-release
 COPY --from=builder /etc/mime.types /etc/mime.types
-
 COPY --from=builder /app/elytra /usr/bin/
-COPY --from=builder /tmp/rustic/rustic /usr/bin/
+COPY --from=ghcr.io/rustic-rs/rustic:v0.10.0 /rustic /usr/local/bin/rustic
 
 ENTRYPOINT ["/usr/bin/elytra"]
 CMD ["--config", "/etc/elytra/config.yml"]
 
-EXPOSE 8080 2022
+EXPOSE 8080 2022

docker-compose.dev.yml

@@ -0,0 +1,50 @@
+services:
+  elytra:
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        VERSION: dev
+        RUSTIC_VERSION: v0.10.0
+        RUSTIC_TARGET: x86_64-unknown-linux-musl
+    image: elytra:dev
+    restart: unless-stopped
+    tty: true
+    stdin_open: true
+    ports:
+      - "8080:8080"
+      - "2022:2022"
+    environment:
+      # Required: Panel connection and token
+      ELYTRA_PANEL_LOCATION: "https://panel.example.com"
+      ELYTRA_TOKEN_ID: "local-token-id"
+      ELYTRA_TOKEN: "local-token-secret"
+
+      # Optional overrides / useful defaults
+      TZ: "UTC"
+      ELYTRA_DEBUG: "true"
+      ELYTRA_API_HOST: "0.0.0.0"
+      ELYTRA_API_PORT: "8080"
+      ELYTRA_UID: "988"
+      ELYTRA_GID: "988"
+
+      # System path overrides (inside container)
+      ELYTRA_SYSTEM_ROOT_DIRECTORY: "/var/lib/elytra"
+      ELYTRA_SYSTEM_DATA: "/var/lib/elytra/volumes"
+      ELYTRA_SYSTEM_LOG_DIRECTORY: "/var/log/elytra"
+
+      # Docker integration (required for managing containers)
+      ELYTRA_DOCKER_TMPFS_SIZE: "100"
+      # Disable rustic backups in container mode unless you have the 'rustic' binary available
+      ELYTRA_SYSTEM_BACKUPS_RUSTIC_LOCAL_ENABLED: "false"
+
+    volumes:
+      - "/var/run/docker.sock:/var/run/docker.sock:ro"
+      - "/var/lib/docker/containers/:/var/lib/docker/containers/:ro"
+      - "./data:/var/lib/elytra"
+      - "./logs:/var/log/elytra"
+      - "./config.dev.yml:/etc/elytra/config.yml:ro"
+
+networks:
+  default:
+    driver: bridge

docker-compose.example.yml

@@ -2,36 +2,41 @@ version: '3.8'
 services:
   elytra:
     image: ghcr.io/pyrohost/elytra:latest
-    restart: always
-    networks:
-      - elytra0
+    restart: unless-stopped
+    tty: true
     ports:
       - "8080:8080"
       - "2022:2022"
-    tty: true
     environment:
+      # Required: Panel connection and token
+      ELYTRA_PANEL_LOCATION: "https://panel.example.com"
+      ELYTRA_TOKEN_ID: "panel-token-id"
+      ELYTRA_TOKEN: "panel-token-value"
+
+      # Optional overrides / useful defaults
       TZ: "UTC"
-      ELYTRA_UID: 988
-      ELYTRA_GID: 988
-      ELYTRA_USERNAME: pyrodactyl
+      ELYTRA_DEBUG: "true"
+      ELYTRA_API_HOST: "0.0.0.0"
+      ELYTRA_API_PORT: "8080"
+      ELYTRA_UID: "988"
+      ELYTRA_GID: "988"
+
+      # System path overrides (inside container)
+      ELYTRA_SYSTEM_ROOT_DIRECTORY: "/var/lib/elytra"
+      ELYTRA_SYSTEM_DATA: "/var/lib/elytra/volumes"
+      ELYTRA_SYSTEM_LOG_DIRECTORY: "/var/log/elytra"
+
+      # Docker integration (required for managing containers)
+      ELYTRA_DOCKER_TMPFS_SIZE: "100"
+      # Disable rustic backups in container mode unless you have the 'rustic' binary available
+      ELYTRA_SYSTEM_BACKUPS_RUSTIC_LOCAL_ENABLED: "false"
+
     volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock"
-      - "/var/lib/docker/containers/:/var/lib/docker/containers/"
-      - "/etc/elytra/:/etc/elytra/"
-      - "/var/lib/elytra/:/var/lib/elytra/"
-      - "/var/log/elytra/:/var/log/elytra/"
-      - "/tmp/elytra/:/tmp/elytra/"
-      - "/etc/ssl/certs:/etc/ssl/certs:ro"
-      # you may need /srv/daemon-data if you are upgrading from an old daemon
-      #- "/srv/daemon-data/:/srv/daemon-data/"
-      # Required for ssl if you use let's encrypt. uncomment to use.
-      #- "/etc/letsencrypt/:/etc/letsencrypt/"
+      - "/var/run/docker.sock:/var/run/docker.sock:ro"
+      - "/var/lib/docker/containers/:/var/lib/docker/containers/:ro"
+      - "./data:/var/lib/elytra"
+      - "./logs:/var/log/elytra"
+
 networks:
-  elytra0:
-    name: elytra0
+  default:
     driver: bridge
-    ipam:
-      config:
-        - subnet: "172.21.0.0/16"
-    driver_opts:
-      com.docker.network.bridge.name: elytra0

src/cmd/root.go

@@ -433,12 +433,35 @@ func initConfig() {
 		configPath = d
 	}
 
+	// Try to load configuration from the file first. If it doesn't exist, or
+	// if values required to connect to the Panel are missing, fall back to
+	// reading from environment variables using the ELYTRA_ prefix.
 	err := config.FromFile(configPath)
 	if err != nil {
 		if errors.Is(err, os.ErrNotExist) {
-			exitWithConfigurationNotice()
+			// Attempt to load from environment variables instead of exiting
+			// immediately. This supports containerized deployments where a
+			// config file may not be present.
+			log2.Printf("cmd/root: configuration file not found (%s), attempting to load from environment variables...", configPath)
+			if err := config.FromEnv(); err != nil {
+				log2.Fatalf("cmd/root: failed to load configuration from environment: %s", err)
+			}
+		} else {
+			log2.Fatalf("cmd/root: error while reading configuration file: %s", err)
+		}
+	}
+
+	// Validate we have required configuration; if not, try merging env vars
+	// into the loaded config (useful when some values are stored in env).
+	if err := config.ValidateRequired(config.Get()); err != nil {
+		// Merge environment variables into the existing config and validate again.
+		log2.Printf("cmd/root: configuration incomplete: %s, attempting to merge environment variables...", err)
+		if err := config.MergeEnv(config.Get()); err != nil {
+			log2.Fatalf("cmd/root: failed to merge environment variables: %s", err)
+		}
+		if err := config.ValidateRequired(config.Get()); err != nil {
+			log2.Fatalf("cmd/root: configuration validation failed: %s", err)
 		}
-		log2.Fatalf("cmd/root: error while reading configuration file: %s", err)
 	}
 	if debug && !config.Get().Debug {
 		config.SetDebugViaFlag(debug)

src/config/config.go

@@ -25,8 +25,8 @@ import (
 	"github.com/gbrlsnchs/jwt/v3"
 	"golang.org/x/sys/unix"
 	"gopkg.in/yaml.v2"
-
 	"github.com/pyrohost/elytra/src/system"
+
 )
 
 const DefaultLocation = "/etc/elytra/config.yml"